From: Christian Marangi <ansuelsmth@gmail.com>
Date: Wed, 7 Dec 2022 17:09:18 +0000 (+0100)
Subject: CI: build: skip sdk adapt to external toolchain on cache hit
X-Git-Tag: v22.03.3~57
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=385f78780cbc9f65d0944d4d16b6a9190ae19e0d;p=openwrt%2Fstaging%2Fhauke.git

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)
---

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: |