X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=jobs%2Flttng-tools.yaml;h=00db6ef2d939363f0dad7911c3f9fa85e1ac7150;hb=07fc222e39aa5de61ecdbc1dd6bf9653dc6b97d5;hp=43cf46cd952cf80357b4cfa8c4e6d96a7b96dbae;hpb=a1f0d20d9770afdc6f633edc829a3d72f57ec860;p=lttng-ci.git

diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml
index 43cf46c..00db6ef 100644
--- a/jobs/lttng-tools.yaml
+++ b/jobs/lttng-tools.yaml
@@ -356,17 +356,6 @@
           filter: 'build/**'
           target: 'deps'
           do-not-fingerprint: true
-      - conditional-step:
-          condition-kind: strings-match
-          on-evaluation-failure: run
-          condition-string1: '${{arch}}'
-          condition-string2: 'cygwin'
-          steps:
-            - shell:
-               !include-raw-escape:
-                 - scripts/common/cygwin-shebang
-                 - scripts/common/cygwin-prefix
-                 - scripts/lttng-tools/build.sh
       - conditional-step:
           condition-kind: strings-match
           on-evaluation-failure: run
@@ -376,7 +365,7 @@
             - shell:
                !include-raw-escape:
                  - scripts/common/cygwin64-shebang
-                 - scripts/common/cygwin-prefix
+                 - scripts/common/cygpath-prefix
                  - scripts/lttng-tools/build.sh
       - conditional-step:
           condition-kind: strings-match
@@ -389,7 +378,7 @@
             - shell:
                !include-raw-escape:
                  - scripts/common/msys2-shebang
-                 - scripts/common/cygwin-prefix
+                 - scripts/common/cygpath-prefix
                  - scripts/lttng-tools/build.sh
       - conditional-step:
           condition-kind: strings-match
@@ -402,7 +391,7 @@
             - shell:
                !include-raw-escape:
                  - scripts/common/msys2-shebang
-                 - scripts/common/cygwin-prefix
+                 - scripts/common/cygpath-prefix
                  - scripts/lttng-tools/build.sh
 
 - lttng-tools_build_publishers_dev: &lttng-tools_build_publishers_dev
@@ -907,7 +896,7 @@
       - 'lttng-tools_{version}_winbuild':
           version: master
           ustversion: master
-          arch: !!python/tuple [cygwin, cygwin64]
+          arch: !!python/tuple [cygwin64]
           build: !!python/tuple [std]
           conf: !!python/tuple [relayd-only]
           urcuversion: !!python/tuple [master]
@@ -988,7 +977,7 @@
       - 'lttng-tools_{version}_winbuild':
           version: stable-2.12
           ustversion: stable-2.12
-          arch: !!python/tuple [cygwin, cygwin64]
+          arch: !!python/tuple [cygwin64]
           build: !!python/tuple [std]
           conf: !!python/tuple [relayd-only]
           urcuversion: !!python/tuple [stable-0.11]
@@ -1069,7 +1058,7 @@
       - 'lttng-tools_{version}_winbuild':
           version: stable-2.11
           ustversion: stable-2.11
-          arch: !!python/tuple [cygwin, cygwin64]
+          arch: !!python/tuple [cygwin64]
           build: !!python/tuple [std]
           conf: !!python/tuple [relayd-only]
           urcuversion: !!python/tuple [stable-0.10]
@@ -1150,7 +1139,7 @@
       - 'lttng-tools_{version}_winbuild':
           version: stable-2.10
           ustversion: stable-2.10
-          arch: !!python/tuple [cygwin, cygwin64]
+          arch: !!python/tuple [cygwin64]
           build: !!python/tuple [std]
           conf: !!python/tuple [relayd-only]
           urcuversion: !!python/tuple [stable-0.9]
@@ -1231,7 +1220,7 @@
       - 'lttng-tools_{version}_winbuild':
           version: stable-2.9
           ustversion: stable-2.9
-          arch: !!python/tuple [cygwin, cygwin64]
+          arch: !!python/tuple [cygwin64]
           build: !!python/tuple [std]
           conf: !!python/tuple [relayd-only]
           urcuversion: !!python/tuple [stable-0.9]