aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Marangi <ansuelsmth@gmail.com>2022-12-07 18:09:18 +0100
committerChristian Marangi <ansuelsmth@gmail.com>2022-12-07 18:17:46 +0100
commit385f78780cbc9f65d0944d4d16b6a9190ae19e0d (patch)
treeb6f246536a5ef09540affd696c5e98ff5b32799b
parent8be50c369bbf12763d88e36f9945dce54b432975 (diff)
downloadupstream-385f78780cbc9f65d0944d4d16b6a9190ae19e0d.tar.gz
upstream-385f78780cbc9f65d0944d4d16b6a9190ae19e0d.tar.bz2
upstream-385f78780cbc9f65d0944d4d16b6a9190ae19e0d.zip
CI: build: skip sdk adapt to external toolchain on cache hit
On cache hit, skip sdk adapt to external toolchain. This is needed because we cache the already extracted sdk and that is already adapted to be used as external toolchain. Rerunning the adap step will result in the test to fail for missing file as the file are already got wrapped to the external toolchain format. Fixes: 42f0ab028e2e ("CI: build: fix use of sdk as toolchain") Signed-off-by: Christian Marangi <ansuelsmth@gmail.com> (cherry picked from commit 99eaedfe3966b1ca812e8a962197cf91286247f7)
-rw-r--r--.github/workflows/build.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 43f30617d8..1c665cb869 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -267,7 +267,7 @@ jobs:
--config ${{ env.TARGET }}/${{ env.SUBTARGET }}
- name: Adapt external sdk to external toolchain format
- if: inputs.build_toolchain == false && steps.parse-toolchain.outputs.toolchain-type == 'external_sdk'
+ if: inputs.build_toolchain == false && steps.parse-toolchain.outputs.toolchain-type == 'external_sdk' && steps.cache-external-toolchain.outputs.cache-hit != 'true'
shell: su buildbot -c "sh -e {0}"
working-directory: openwrt
run: |