X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=jobs%2Fbabeltrace.yaml;h=a37dc31a8ee388fdd839f407936e83d0789031db;hb=4e9d92412f9615a419e17d6c7da302727c774175;hp=c307dd642a68ed3c4bf767c8da1e6a40fa874bc0;hpb=e7f82d74621962ef8164e5ef0527975df707faef;p=lttng-ci.git diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml index c307dd6..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 @@ -350,7 +339,7 @@ - throttle: option: 'category' categories: - - 'gerrit' + - 'gerrit-{buildtype}' - job-template: name: dev_gerrit_babeltrace_winbuild @@ -389,7 +378,7 @@ - throttle: option: 'category' categories: - - 'gerrit' + - 'gerrit-winbuild' <<: *babeltrace_build_axes_defaults <<: *babeltrace_build_builders_win @@ -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'