X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Fbabeltrace.yaml;h=ffcf5c3b9ebb4f448f739922b73f5c74965c0502;hb=e797d68013e210503048780208d57eca8365c176;hp=8a4ed6a8af28710a1dc98f8d7dfff01c4ea9da3f;hpb=bbe1b8b43290cdedb787ad857ef7617877cd044c;p=lttng-ci.git

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index 8a4ed6a..ffcf5c3 100644
--- a/jobs/babeltrace.yaml
+++ b/jobs/babeltrace.yaml
@@ -109,24 +109,10 @@
           condition-kind: strings-match
           on-evaluation-failure: run
           condition-string1: {{ '${{platform}}' }}
-          condition-string2: 'msys2-mingw32'
+          condition-string2: 'msys2-ucrt64'
           steps:
             - inject:
-               properties-content: 'MSYSTEM=MINGW32'
-            - shell:
-               !include-raw-escape:
-                 - scripts/common/msys2-shebang
-                 - scripts/common/cygpath-prefix
-                 - scripts/common/print.sh
-                 - scripts/babeltrace/build.sh
-      - conditional-step:
-          condition-kind: strings-match
-          on-evaluation-failure: run
-          condition-string1: {{ '${{platform}}' }}
-          condition-string2: 'msys2-mingw64'
-          steps:
-            - inject:
-               properties-content: 'MSYSTEM=MINGW64'
+               properties-content: 'MSYSTEM=UCRT64'
             - shell:
                !include-raw-escape:
                  - scripts/common/msys2-shebang
@@ -554,7 +540,7 @@
     publishers:
       - workspace-cleanup: *babeltrace_publisher_workspace-cleanup_defaults
       - archive:
-          artifacts: 'black.out,flake8.out'
+          artifacts: 'black.out,flake8.out,isort.out'
           allow-empty: false
       - ircbot: *babeltrace_publisher_ircbot_defaults
       - email-ext: *babeltrace_publisher_email-ext_defaults
@@ -623,7 +609,7 @@
           touchstone: ''
       - '{job_prefix}babeltrace_{version}_{buildtype}':
           buildtype: macosbuild
-          platforms: !!python/tuple [macos-amd64, macos-arm64]
+          platforms: !!python/tuple [macos-arm64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std, prod]
           filter: ''
@@ -637,7 +623,7 @@
           touchstone: ''
       - '{job_prefix}babeltrace_{version}_{buildtype}':
           buildtype: winbuild
-          platforms: !!python/tuple [cygwin64, msys2-mingw32, msys2-mingw64]
+          platforms: !!python/tuple [cygwin64, msys2-ucrt64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std]
           filter: ''
@@ -691,7 +677,7 @@
       - 'dev_review_babeltrace_{version}_{buildtype}':
           version: master
           buildtype: macosbuild
-          platforms: !!python/tuple [macos-amd64, macos-arm64]
+          platforms: !!python/tuple [macos-arm64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std, prod]
           filter: ''
@@ -700,7 +686,7 @@
       - 'dev_review_babeltrace_{version}_{buildtype}':
           version: master
           buildtype: winbuild
-          platforms: !!python/tuple [cygwin64, msys2-mingw64]
+          platforms: !!python/tuple [cygwin64, msys2-ucrt64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std]
           filter: ''
@@ -729,7 +715,7 @@
       - 'dev_review_babeltrace_{version}_{buildtype}':
           version: ctf2
           buildtype: macosbuild
-          platforms: !!python/tuple [macos-amd64, macos-arm64]
+          platforms: !!python/tuple [macos-arm64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std, prod]
           filter: ''
@@ -738,7 +724,7 @@
       - 'dev_review_babeltrace_{version}_{buildtype}':
           version: ctf2
           buildtype: winbuild
-          platforms: !!python/tuple [cygwin64, msys2-mingw64]
+          platforms: !!python/tuple [cygwin64, msys2-ucrt64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std]
           filter: ''
@@ -767,7 +753,7 @@
       - 'dev_review_babeltrace_{version}_{buildtype}':
           version: stable-2.0
           buildtype: macosbuild
-          platforms: !!python/tuple [macos-amd64, macos-arm64]
+          platforms: !!python/tuple [macos-arm64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std, prod]
           filter: ''
@@ -776,7 +762,7 @@
       - 'dev_review_babeltrace_{version}_{buildtype}':
           version: stable-2.0
           buildtype: winbuild
-          platforms: !!python/tuple [cygwin64, msys2-mingw64]
+          platforms: !!python/tuple [cygwin64, msys2-ucrt64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std]
           filter: ''
@@ -853,7 +839,7 @@
           touchstone: ''
       - '{job_prefix}babeltrace_{version}_{buildtype}':
           buildtype: macosbuild
-          platforms: !!python/tuple [macos-amd64, macos-arm64]
+          platforms: !!python/tuple [macos-arm64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std]
           filter: ''
@@ -882,7 +868,7 @@
           touchstone: ''
       - '{job_prefix}babeltrace_{version}_{buildtype}':
           buildtype: macosbuild
-          platforms: !!python/tuple [macos-amd64, macos-arm64]
+          platforms: !!python/tuple [macos-arm64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std, prod]
           filter: ''