diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2021-01-18 14:21:45 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2021-01-18 14:22:07 +0000 |
| commit | 287d6f3ed265af160175d88eb42048dbb2e91ac9 (patch) | |
| tree | a97dffd3fd2abc0fee3d9ebdb8a23bd8184fe145 | |
| parent | b56be6c57a1f80567bcb496a30d4b996e9db496f (diff) | |
tcwg-gnu-builds: Fix single-toolchain builds
Change-Id: Ie6162bcb590409af234425f4e97818c76375e71e
| -rw-r--r-- | tcwg-gnu-builds.yaml | 19 | ||||
| -rw-r--r-- | tcwg-gnu-builds.yaml.in | 17 |
2 files changed, 25 insertions, 11 deletions
diff --git a/tcwg-gnu-builds.yaml b/tcwg-gnu-builds.yaml index 3fcbefb04a..3be456d5c0 100644 --- a/tcwg-gnu-builds.yaml +++ b/tcwg-gnu-builds.yaml @@ -173,7 +173,14 @@ - copyartifact: project: tcwg-dev-build which-build: specific-build - build-number: $TCWG_DEV_BUILD_1_BUILD_NUMBER + # Note that $TCWG_DEV_BUILD_BUILD_NUMBER points to the last + # build (i.e., it's the same as $TCWG_DEV_BUILD_5_BUILD_NUMBER + # in a full 5-configuration build). At the same time, + # $TCWG_DEV_BUILD_nnn_BUILD_NUMBER variables are defined only + # when multiple builds were triggered. + # We need to use $TCWG_DEV_BUILD_BUILD_NUMBER here to correctly + # handle single-toolchain builds. + build-number: $TCWG_DEV_BUILD_BUILD_NUMBER target: tcwg-dev-build-1 - conditional-step: condition-kind: num-comp @@ -184,7 +191,7 @@ - copyartifact: project: tcwg-dev-build which-build: specific-build - build-number: $TCWG_DEV_BUILD_2_BUILD_NUMBER + build-number: $TCWG_DEV_BUILD_1_BUILD_NUMBER target: tcwg-dev-build-2 - conditional-step: condition-kind: num-comp @@ -195,7 +202,7 @@ - copyartifact: project: tcwg-dev-build which-build: specific-build - build-number: $TCWG_DEV_BUILD_3_BUILD_NUMBER + build-number: $TCWG_DEV_BUILD_2_BUILD_NUMBER target: tcwg-dev-build-3 - conditional-step: condition-kind: num-comp @@ -206,7 +213,7 @@ - copyartifact: project: tcwg-dev-build which-build: specific-build - build-number: $TCWG_DEV_BUILD_4_BUILD_NUMBER + build-number: $TCWG_DEV_BUILD_3_BUILD_NUMBER target: tcwg-dev-build-4 - conditional-step: condition-kind: num-comp @@ -217,7 +224,7 @@ - copyartifact: project: tcwg-dev-build which-build: specific-build - build-number: $TCWG_DEV_BUILD_5_BUILD_NUMBER + build-number: $TCWG_DEV_BUILD_4_BUILD_NUMBER target: tcwg-dev-build-5 - linaro-publish-token - shell: | @@ -319,4 +326,4 @@ predefined-parameters: | version=master distro=focal -# checksum: 79e486ef7a45d103851a93522ae7c19c +# checksum: 58aac4e5dbc36314bb5ad61640f3c013 diff --git a/tcwg-gnu-builds.yaml.in b/tcwg-gnu-builds.yaml.in index 7b7e878a9e..de80569b79 100644 --- a/tcwg-gnu-builds.yaml.in +++ b/tcwg-gnu-builds.yaml.in @@ -140,7 +140,14 @@ - copyartifact: project: tcwg-dev-build which-build: specific-build - build-number: $TCWG_DEV_BUILD_1_BUILD_NUMBER + # Note that $TCWG_DEV_BUILD_BUILD_NUMBER points to the last + # build (i.e., it's the same as $TCWG_DEV_BUILD_5_BUILD_NUMBER + # in a full 5-configuration build). At the same time, + # $TCWG_DEV_BUILD_nnn_BUILD_NUMBER variables are defined only + # when multiple builds were triggered. + # We need to use $TCWG_DEV_BUILD_BUILD_NUMBER here to correctly + # handle single-toolchain builds. + build-number: $TCWG_DEV_BUILD_BUILD_NUMBER target: tcwg-dev-build-1 - conditional-step: condition-kind: num-comp @@ -151,7 +158,7 @@ - copyartifact: project: tcwg-dev-build which-build: specific-build - build-number: $TCWG_DEV_BUILD_2_BUILD_NUMBER + build-number: $TCWG_DEV_BUILD_1_BUILD_NUMBER target: tcwg-dev-build-2 - conditional-step: condition-kind: num-comp @@ -162,7 +169,7 @@ - copyartifact: project: tcwg-dev-build which-build: specific-build - build-number: $TCWG_DEV_BUILD_3_BUILD_NUMBER + build-number: $TCWG_DEV_BUILD_2_BUILD_NUMBER target: tcwg-dev-build-3 - conditional-step: condition-kind: num-comp @@ -173,7 +180,7 @@ - copyartifact: project: tcwg-dev-build which-build: specific-build - build-number: $TCWG_DEV_BUILD_4_BUILD_NUMBER + build-number: $TCWG_DEV_BUILD_3_BUILD_NUMBER target: tcwg-dev-build-4 - conditional-step: condition-kind: num-comp @@ -184,7 +191,7 @@ - copyartifact: project: tcwg-dev-build which-build: specific-build - build-number: $TCWG_DEV_BUILD_5_BUILD_NUMBER + build-number: $TCWG_DEV_BUILD_4_BUILD_NUMBER target: tcwg-dev-build-5 - linaro-publish-token - shell: | |