From 8f5416789ef38902575e864a18964a1dc6324c6b Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson@efficios.com>
Date: Thu, 22 Jun 2017 15:35:25 -0400
Subject: [PATCH] jjb: Fix msys2 mingw32/64 builds

---
 jobs/babeltrace.yaml                             | 14 ++++++++++----
 jobs/liburcu.yaml                                |  8 ++++----
 jobs/lttng-tools.yaml                            |  8 ++++----
 scripts/common/{msys64-shebang => msys2-shebang} |  0
 scripts/common/msys32-shebang                    |  1 -
 5 files changed, 18 insertions(+), 13 deletions(-)
 rename scripts/common/{msys64-shebang => msys2-shebang} (100%)
 delete mode 100644 scripts/common/msys32-shebang

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index 4721dac..12d80ac 100644
--- 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 2915d2b..05508ff 100644
--- 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 b8e1213..ba4c601 100644
--- 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/msys64-shebang b/scripts/common/msys2-shebang
similarity index 100%
rename from scripts/common/msys64-shebang
rename to scripts/common/msys2-shebang
diff --git a/scripts/common/msys32-shebang b/scripts/common/msys32-shebang
deleted file mode 100644
index f4dbe07..0000000
--- a/scripts/common/msys32-shebang
+++ /dev/null
@@ -1 +0,0 @@
-#!c:\msys32\usr\bin\bash --login
-- 
2.34.1