jjb: Fix msys2 mingw32/64 builds

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index 4721dac83554e567e2829498fe0a6ac6efff2af0..12d80acceb8f86b6c88de4be58138d384d583fbe 100644 (file)
--- a/jobs/babeltrace.yaml
+++ b/jobs/babeltrace.yaml
@@ -104,26 +104,26 @@
           condition-kind: strings-match
           on-evaluation-failure: run
           condition-string1: '${{arch}}'
-          condition-string2: 'msys32'
+          condition-string2: 'msys2-mingw32'
           steps:
             - inject:
                properties-content: 'MSYSTEM=MINGW32'
             - shell:
                !include-raw-escape:
-                 - scripts/common/msys32-shebang
+                 - scripts/common/msys2-shebang
                  - scripts/common/cygwin-prefix
                  - scripts/babeltrace/build.sh
       - conditional-step:
           condition-kind: strings-match
           on-evaluation-failure: run
           condition-string1: '${{arch}}'
-          condition-string2: 'msys64'
+          condition-string2: 'msys2-mingw64'
           steps:
             - inject:
                properties-content: 'MSYSTEM=MINGW64'
             - shell:
                !include-raw-escape:
-                 - scripts/common/msys64-shebang
+                 - scripts/common/msys2-shebang
                  - scripts/common/cygwin-prefix
                  - scripts/babeltrace/build.sh
 
@@ -376,6 +376,12 @@
             - stable-1.4
             - stable-1.5
             - master
+      - 'babeltrace_{version}_winbuild':
+          arch: !!python/tuple [cygwin, cygwin64, msys2-mingw32, msys2-mingw64]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std]
+          version:
+            - master
       - 'babeltrace_{version}_winbuild':
           arch: !!python/tuple [cygwin, cygwin64]
           build: !!python/tuple [std]

diff --git a/jobs/liburcu.yaml b/jobs/liburcu.yaml
index 2915d2b14100a0d71ad60ba36bc6140f39d2c135..05508ff7b3357761f3a2c60d8367e8f5a65921d1 100644 (file)
--- a/jobs/liburcu.yaml
+++ b/jobs/liburcu.yaml
@@ -117,26 +117,26 @@
           condition-kind: strings-match
           on-evaluation-failure: run
           condition-string1: '${{arch}}'
-          condition-string2: 'msys32'
+          condition-string2: 'msys2-mingw32'
           steps:
             - inject:
                properties-content: 'MSYSTEM=MINGW32'
             - shell:
                !include-raw-escape:
-                 - scripts/common/msys32-shebang
+                 - scripts/common/msys2-shebang
                  - scripts/common/cygwin-prefix
                  - scripts/liburcu/build.sh
       - conditional-step:
           condition-kind: strings-match
           on-evaluation-failure: run
           condition-string1: '${{arch}}'
-          condition-string2: 'msys64'
+          condition-string2: 'msys2-mingw64'
           steps:
             - inject:
                properties-content: 'MSYSTEM=MINGW64'
             - shell:
                !include-raw-escape:
-                 - scripts/common/msys64-shebang
+                 - scripts/common/msys2-shebang
                  - scripts/common/cygwin-prefix
                  - scripts/liburcu/build.sh
 

diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml
index b8e1213a4a5229d32d78b9eac1002a7e5e4f4363..ba4c6011412ae349adcdba0d42d740926f14fdb0 100644 (file)
--- a/jobs/lttng-tools.yaml
+++ b/jobs/lttng-tools.yaml
@@ -251,26 +251,26 @@
           condition-kind: strings-match
           on-evaluation-failure: run
           condition-string1: '${{arch}}'
-          condition-string2: 'msys32'
+          condition-string2: 'msys2-mingw32'
           steps:
             - inject:
                properties-content: 'MSYSTEM=MINGW32'
             - shell:
                !include-raw-escape:
-                 - scripts/common/msys32-shebang
+                 - scripts/common/msys2-shebang
                  - scripts/common/cygwin-prefix
                  - scripts/lttng-tools/build.sh
       - conditional-step:
           condition-kind: strings-match
           on-evaluation-failure: run
           condition-string1: '${{arch}}'
-          condition-string2: 'msys64'
+          condition-string2: 'msys2-mingw64'
           steps:
             - inject:
                properties-content: 'MSYSTEM=MINGW64'
             - shell:
                !include-raw-escape:
-                 - scripts/common/msys64-shebang
+                 - scripts/common/msys2-shebang
                  - scripts/common/cygwin-prefix
                  - scripts/lttng-tools/build.sh
 

diff --git a/scripts/common/msys2-shebang b/scripts/common/msys2-shebang
new file mode 100644 (file)
index 0000000..ad43c2e
--- /dev/null
+++ b/scripts/common/msys2-shebang
@@ -0,0 +1 @@
+#!c:\msys64\usr\bin\bash --login

diff --git a/scripts/common/msys32-shebang b/scripts/common/msys32-shebang
deleted file mode 100644 (file)
index f4dbe07..0000000
--- a/scripts/common/msys32-shebang
+++ /dev/null
@@ -1 +0,0 @@
-#!c:\msys32\usr\bin\bash --login

diff --git a/scripts/common/msys64-shebang b/scripts/common/msys64-shebang
deleted file mode 100644 (file)
index ad43c2e..0000000
--- a/scripts/common/msys64-shebang
+++ /dev/null
@@ -1 +0,0 @@
-#!c:\msys64\usr\bin\bash --login