X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Fbabeltrace.yaml;h=c650db589d4b7435ff5cdc6de45befd324d3986e;hb=ad59aae8600b681d244d6acaab7e9a77242631e8;hp=616753cfd7bb0d9621268debb970420c78796beb;hpb=b9c55ae7c669ccb275c1504c6c1b4f0b02d596d0;p=lttng-ci.git

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index 616753c..c650db5 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
 
@@ -340,6 +340,7 @@
       - stable-1.3
       - stable-1.4
       - stable-1.5
+      - stable-2.0
       - master
     jobs:
       - 'babeltrace_{version}_{buildtype}':
@@ -357,9 +358,14 @@
           arch: !!python/tuple [armhf, arm64, powerpc, ppc64el]
           build: !!python/tuple [std]
           conf: !!python/tuple [std, static, python-bindings]
+      - 'babeltrace_{version}_{buildtype}':
+          buildtype: slesbuild
+          arch: !!python/tuple [sles12sp2]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std]
       - 'babeltrace_{version}_{buildtype}':
           buildtype: solarisbuild
-          arch: !!python/tuple [solaris10, solaris11]
+          arch: !!python/tuple [sol10-i386, sol11-i386]
           build: !!python/tuple [std]
           conf: !!python/tuple [std, static]
       - 'babeltrace_{version}_{buildtype}':
@@ -367,15 +373,23 @@
           arch: !!python/tuple [macosx]
           build: !!python/tuple [std]
           conf: !!python/tuple [std]
-          version:
+          version: # macOS support was introduced in 1.4
             - stable-1.4
             - stable-1.5
+            - stable-2.0
+            - master
+      - 'babeltrace_{version}_winbuild':
+          arch: !!python/tuple [cygwin, cygwin64, msys2-mingw32, msys2-mingw64]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std]
+          version: # Mingw support was introduced in 2.0
+            - stable-2.0
             - master
       - 'babeltrace_{version}_winbuild':
           arch: !!python/tuple [cygwin, cygwin64]
           build: !!python/tuple [std]
           conf: !!python/tuple [std]
-          version:
+          version: # Cygwin support was introduced in 1.5
             - stable-1.5
       - 'babeltrace_{version}_cppcheck'
       - 'babeltrace_{version}_scan-build'
@@ -384,34 +398,35 @@
           version: master
       - 'babeltrace_{version}_glib-2.22.5':
           version: master
+
+
+- project:
+    name: babeltrace-jgalar-staging
+    user: jgalar
+    github_user: jgalar
+    github_name: babeltrace
+    version:
+      - stable-1.3-staging
+      - stable-1.4-staging
+      - stable-1.5-staging
+      - stable-2.0-staging
+      - master-staging
+    jobs:
       - 'dev_{user}_babeltrace_{version}_glib-2.22.5':
-          user: jgalar
-          github_user: jgalar
-          github_name: babeltrace
           version:
             - master-staging
       - 'dev_{user}_babeltrace_{version}_{buildtype}':
-          user: jgalar
-          github_user: jgalar
-          github_name: babeltrace
           buildtype: build
-          version:
-            - master-staging
-            - stable-1.3-staging
-            - stable-1.4-staging
-            - stable-1.5-staging
           arch: !!python/tuple [x86-32, x86-64]
           build: !!python/tuple [std, oot, dist]
           conf: !!python/tuple [std, static, python-bindings]
       - 'dev_{user}_babeltrace_{version}_{buildtype}':
-          user: jgalar
-          github_user: jgalar
-          github_name: babeltrace
           buildtype: macosxbuild
-          version:
-            - master-staging
+          version: # macOS support was introduced in 1.4
             - stable-1.4-staging
             - stable-1.5-staging
+            - stable-2.0-staging
+            - master-staging
           arch: !!python/tuple [macosx]
           build: !!python/tuple [std]
           conf: !!python/tuple [std]