From 46a3a4f7e320d6f99f660f179ab01f778973b9db Mon Sep 17 00:00:00 2001 From: Li Jie Date: Sat, 15 Feb 2025 19:30:07 +0800 Subject: [PATCH 1/3] ci: disable populate cache --- .github/workflows/release-build.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index 2be526a9..281e11b2 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -11,18 +11,9 @@ jobs: steps: - name: Check out code uses: actions/checkout@v4 - - name: Cache Darwin sysroot - id: cache-sysroot - uses: actions/cache@v4 - with: - path: | - .sysroot/darwin.tar.gz - key: darwin-sysroot-${{ runner.os }}-${{ hashFiles('.github/workflows/populate_darwin_sysroot.sh') }} - name: Populate Darwin sysroot - if: steps.cache-sysroot.outputs.cache-hit != 'true' run: bash .github/workflows/populate_darwin_sysroot.sh - name: Create Darwin sysroot tarball - if: steps.cache-sysroot.outputs.cache-hit != 'true' run: tar -czvf .sysroot/darwin.tar.gz -C .sysroot darwin - name: Upload Darwin sysroot tarball uses: actions/upload-artifact@v4 From fbb978e8a527c72b7cbb25c1dd93325401ffb905 Mon Sep 17 00:00:00 2001 From: Li Jie Date: Sat, 15 Feb 2025 19:30:32 +0800 Subject: [PATCH 2/3] ci: populate linux sysroot in parallel --- .github/workflows/populate_linux_sysroot.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/populate_linux_sysroot.sh b/.github/workflows/populate_linux_sysroot.sh index 57e44c09..1bc1d935 100755 --- a/.github/workflows/populate_linux_sysroot.sh +++ b/.github/workflows/populate_linux_sysroot.sh @@ -139,5 +139,8 @@ populate_linux_sysroot() { debian:bullseye \ /populate_linux_sysroot.sh } -populate_linux_sysroot amd64 "${LINUX_AMD64_PREFIX}" -populate_linux_sysroot arm64 "${LINUX_ARM64_PREFIX}" +populate_linux_sysroot amd64 "${LINUX_AMD64_PREFIX}" & +populate_linux_sysroot arm64 "${LINUX_ARM64_PREFIX}" & + +# Wait for both background processes to complete +wait From 4dcc944f5362d31b0ceb6f541332047ade3eb910 Mon Sep 17 00:00:00 2001 From: Li Jie Date: Sat, 15 Feb 2025 19:31:01 +0800 Subject: [PATCH 3/3] ci: lock tonistiigi/binfmt:qemu-v7.0.0-28 to avoid binfmt crash --- .github/workflows/release-build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index 281e11b2..e33cb715 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -35,6 +35,8 @@ jobs: go-version: 1.23.x - name: Set up QEMU uses: docker/setup-qemu-action@v3 + with: + image: tonistiigi/binfmt:qemu-v7.0.0-28 - name: Download Darwin sysroot tarball uses: actions/download-artifact@v4 with: