Merge pull request #1279 from luoliwoshang/ci/refreshCacheKey

ci:update .sysroot cache key & catch docker exit
This commit is contained in:
xushiwei
2025-09-09 14:12:48 +08:00
committed by GitHub
2 changed files with 6 additions and 3 deletions

View File

@@ -139,7 +139,10 @@ populate_linux_sysroot() {
/populate_linux_sysroot.sh /populate_linux_sysroot.sh
} }
populate_linux_sysroot amd64 "${LINUX_AMD64_PREFIX}" & populate_linux_sysroot amd64 "${LINUX_AMD64_PREFIX}" &
PID1=$!
populate_linux_sysroot arm64 "${LINUX_ARM64_PREFIX}" & populate_linux_sysroot arm64 "${LINUX_ARM64_PREFIX}" &
PID2=$!
# Wait for both background processes to complete # Wait for both background processes to complete
wait wait $PID1 || exit $?
wait $PID2 || exit $?

View File

@@ -23,8 +23,8 @@ jobs:
- name: Calculate cache keys - name: Calculate cache keys
id: cache-keys id: cache-keys
run: | run: |
DARWIN_KEY="darwin-sysroot-${{ hashFiles('.github/workflows/populate_darwin_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') }}" 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 "darwin-key=$DARWIN_KEY" >> $GITHUB_OUTPUT
echo "linux-key=$LINUX_KEY" >> $GITHUB_OUTPUT echo "linux-key=$LINUX_KEY" >> $GITHUB_OUTPUT