jjb: drop macos-amd64 except for binutils-gdb

[lttng-ci.git] / jobs / babeltrace.yaml

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index 51dd99e5762e10984508a472d8605076ec8a417e..ffcf5c3b9ebb4f448f739922b73f5c74965c0502 100644 (file)
--- 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
@@ -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: ''