From: Michael Jeanson <mjeanson@efficios.com>
Date: Fri, 15 Dec 2023 20:07:46 +0000 (-0500)
Subject: jjb: babeltrace: move mingw64 builds to ucrt64
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=de4b8cd9e06efc813cd8aebf4fa9b363d59fb55c;p=lttng-ci.git

jjb: babeltrace: move mingw64 builds to ucrt64

UCRT64 is the new default runtime supported by the MSYS2 project.

Change-Id: I74576e3a7c7e7522b12abd103105bada70bb5051
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
---

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index b5fd2fb..f635467 100644
--- a/jobs/babeltrace.yaml
+++ b/jobs/babeltrace.yaml
@@ -109,10 +109,10 @@
           condition-kind: strings-match
           on-evaluation-failure: run
           condition-string1: {{ '${{platform}}' }}
-          condition-string2: 'msys2-mingw64'
+          condition-string2: 'msys2-ucrt64'
           steps:
             - inject:
-               properties-content: 'MSYSTEM=MINGW64'
+               properties-content: 'MSYSTEM=UCRT64'
             - shell:
                !include-raw-escape:
                  - scripts/common/msys2-shebang
@@ -623,7 +623,7 @@
           touchstone: ''
       - '{job_prefix}babeltrace_{version}_{buildtype}':
           buildtype: winbuild
-          platforms: !!python/tuple [cygwin64, msys2-mingw64]
+          platforms: !!python/tuple [cygwin64, msys2-ucrt64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std]
           filter: ''
@@ -686,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: ''
@@ -724,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: ''
@@ -762,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: ''
diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml
index fcc9a18..3ac0814 100644
--- a/jobs/lttng-tools.yaml
+++ b/jobs/lttng-tools.yaml
@@ -336,10 +336,10 @@
           condition-kind: strings-match
           on-evaluation-failure: run
           condition-string1: '${{platform}}'
-          condition-string2: 'msys2-mingw64'
+          condition-string2: 'msys2-ucrt64'
           steps:
             - inject:
-               properties-content: 'MSYSTEM=MINGW64'
+               properties-content: 'MSYSTEM=UCRT64'
             - shell:
                !include-raw-escape:
                  - scripts/common/msys2-shebang