From bb89ef5c5de5b6276d9634f587a7993dcad3c22f Mon Sep 17 00:00:00 2001 From: luoliwoshang <2643523683@qq.com> Date: Mon, 8 Sep 2025 17:44:46 +0800 Subject: [PATCH 1/2] ci:refresh ci .sysroot cache key --- .github/workflows/release-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index 49399c70..4c14fc00 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -23,8 +23,8 @@ jobs: - name: Calculate cache keys id: cache-keys run: | - DARWIN_KEY="darwin-sysroot-${{ hashFiles('.github/workflows/populate_darwin_sysroot.sh', '.github/workflows/release-build.yml') }}" - LINUX_KEY="linux-sysroot-${{ hashFiles('.github/workflows/populate_linux_sysroot.sh', '.github/workflows/release-build.yml') }}" + DARWIN_KEY="darwin-sysroot-${{ hashFiles('.github/workflows/populate_darwin_sysroot.sh', '.github/workflows/release-build.yml') }}-v1.0.0" + LINUX_KEY="linux-sysroot-${{ hashFiles('.github/workflows/populate_linux_sysroot.sh', '.github/workflows/release-build.yml') }}-v1.0.0" echo "darwin-key=$DARWIN_KEY" >> $GITHUB_OUTPUT echo "linux-key=$LINUX_KEY" >> $GITHUB_OUTPUT From 13b5f39125f6ebdd91757ba209f97da829483d4e Mon Sep 17 00:00:00 2001 From: luoliwoshang <2643523683@qq.com> Date: Mon, 8 Sep 2025 19:07:12 +0800 Subject: [PATCH 2/2] ci:fail when docker start error --- .github/workflows/populate_linux_sysroot.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/populate_linux_sysroot.sh b/.github/workflows/populate_linux_sysroot.sh index 7c976c33..b41d3252 100755 --- a/.github/workflows/populate_linux_sysroot.sh +++ b/.github/workflows/populate_linux_sysroot.sh @@ -139,7 +139,10 @@ populate_linux_sysroot() { /populate_linux_sysroot.sh } populate_linux_sysroot amd64 "${LINUX_AMD64_PREFIX}" & +PID1=$! populate_linux_sysroot arm64 "${LINUX_ARM64_PREFIX}" & +PID2=$! # Wait for both background processes to complete -wait +wait $PID1 || exit $? +wait $PID2 || exit $?