[openwrt/openwrt] CI: build: skip sdk adapt to external toolchain on cache hit

LEDE Commits lede-commits at lists.infradead.org
Wed Dec 7 09:20:43 PST 2022


ansuel pushed a commit to openwrt/openwrt.git, branch openwrt-22.03:
https://git.openwrt.org/385f78780cbc9f65d0944d4d16b6a9190ae19e0d

commit 385f78780cbc9f65d0944d4d16b6a9190ae19e0d
Author: Christian Marangi <ansuelsmth at gmail.com>
AuthorDate: Wed Dec 7 18:09:18 2022 +0100

    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 at gmail.com>
    (cherry picked from commit 99eaedfe3966b1ca812e8a962197cf91286247f7)
---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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




More information about the lede-commits mailing list