From cefcd7f8ab5682123fef582f7a87accc30500d38 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Fri, 27 Mar 2020 15:26:46 -0400 Subject: [PATCH] jjb: Remove unsupported cygwin x86-32 jobs Signed-off-by: Michael Jeanson --- jobs/babeltrace.yaml | 21 +++------- jobs/liburcu.yaml | 41 +------------------ jobs/lttng-tools.yaml | 27 ++++-------- .../common/{cygwin-prefix => cygpath-prefix} | 0 scripts/common/cygwin-shebang | 1 - 5 files changed, 15 insertions(+), 75 deletions(-) rename scripts/common/{cygwin-prefix => cygpath-prefix} (100%) delete mode 100644 scripts/common/cygwin-shebang diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml index da6ba00..a37dc31 100644 --- a/jobs/babeltrace.yaml +++ b/jobs/babeltrace.yaml @@ -99,17 +99,6 @@ - babeltrace_build_builders_win: &babeltrace_build_builders_win name: 'babeltrace_build_builders_win' builders: - - 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/babeltrace/build.sh - conditional-step: condition-kind: strings-match on-evaluation-failure: run @@ -119,7 +108,7 @@ - shell: !include-raw-escape: - scripts/common/cygwin64-shebang - - scripts/common/cygwin-prefix + - scripts/common/cygpath-prefix - scripts/babeltrace/build.sh - conditional-step: condition-kind: strings-match @@ -132,7 +121,7 @@ - shell: !include-raw-escape: - scripts/common/msys2-shebang - - scripts/common/cygwin-prefix + - scripts/common/cygpath-prefix - scripts/babeltrace/build.sh - conditional-step: condition-kind: strings-match @@ -145,7 +134,7 @@ - shell: !include-raw-escape: - scripts/common/msys2-shebang - - scripts/common/cygwin-prefix + - scripts/common/cygpath-prefix - scripts/babeltrace/build.sh @@ -687,7 +676,7 @@ conf: !!python/tuple [std, static] cc: !!python/tuple [clang-3.9, clang-4.0, clang-6.0, clang-7] - 'babeltrace_{version}_winbuild': - arch: !!python/tuple [cygwin, cygwin64] + arch: !!python/tuple [cygwin64] build: !!python/tuple [std] conf: !!python/tuple [std] - 'babeltrace_{version}_cppcheck' @@ -734,7 +723,7 @@ conf: !!python/tuple [std, static, prod] cc: !!python/tuple [clang-3.9, clang-4.0, clang-6.0, clang-7] - 'babeltrace_{version}_winbuild': - arch: !!python/tuple [cygwin, cygwin64, msys2-mingw32, msys2-mingw64] + arch: !!python/tuple [cygwin64, msys2-mingw32, msys2-mingw64] build: !!python/tuple [std] conf: !!python/tuple [std] - 'babeltrace_{version}_cppcheck' diff --git a/jobs/liburcu.yaml b/jobs/liburcu.yaml index 71dd223..549cd93 100644 --- a/jobs/liburcu.yaml +++ b/jobs/liburcu.yaml @@ -90,17 +90,6 @@ - liburcu_build_builders_win: &liburcu_build_builders_win name: 'liburcu_build_builders_win' builders: - - 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/liburcu/build.sh - conditional-step: condition-kind: strings-match on-evaluation-failure: run @@ -110,33 +99,7 @@ - shell: !include-raw-escape: - scripts/common/cygwin64-shebang - - scripts/common/cygwin-prefix - - scripts/liburcu/build.sh - - conditional-step: - condition-kind: strings-match - on-evaluation-failure: run - condition-string1: '${{arch}}' - condition-string2: 'msys2-mingw32' - steps: - - inject: - properties-content: 'MSYSTEM=MINGW32' - - shell: - !include-raw-escape: - - scripts/common/msys2-shebang - - scripts/common/cygwin-prefix - - scripts/liburcu/build.sh - - conditional-step: - condition-kind: strings-match - on-evaluation-failure: run - condition-string1: '${{arch}}' - condition-string2: 'msys2-mingw64' - steps: - - inject: - properties-content: 'MSYSTEM=MINGW64' - - shell: - !include-raw-escape: - - scripts/common/msys2-shebang - - scripts/common/cygwin-prefix + - scripts/common/cygpath-prefix - scripts/liburcu/build.sh - liburcu_build_publishers_defaults: &liburcu_build_publishers_defaults @@ -362,7 +325,7 @@ - stable-0.10 - stable-0.11 - 'liburcu_{version}_winbuild': - arch: !!python/tuple [cygwin, cygwin64] + arch: !!python/tuple [cygwin64] build: !!python/tuple [std] conf: !!python/tuple [std] version: 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: <tng-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] diff --git a/scripts/common/cygwin-prefix b/scripts/common/cygpath-prefix similarity index 100% rename from scripts/common/cygwin-prefix rename to scripts/common/cygpath-prefix diff --git a/scripts/common/cygwin-shebang b/scripts/common/cygwin-shebang deleted file mode 100644 index 950a169..0000000 --- a/scripts/common/cygwin-shebang +++ /dev/null @@ -1 +0,0 @@ -#!c:\cygwin\bin\bash --login -- 2.34.1