From 148935732816efbe911e03c6789ada0fd059fca6 Mon Sep 17 00:00:00 2001 From: yeongpin Date: Tue, 22 Apr 2025 11:13:40 +0800 Subject: [PATCH] Update GitHub Actions workflow to ensure build jobs depend on version determination. Simplify ARM64 Docker build process by directly renaming output files without pre-checks for existence. --- .github/workflows/build.yml | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c7fdd12..93fe2a4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -141,7 +141,7 @@ jobs: path: dist/CursorFreeVIP_${{ env.VERSION }}_mac_arm64 build-linux-x64: - needs: create-tag + needs: [create-tag , determine-version] runs-on: ubuntu-22.04 steps: @@ -178,7 +178,7 @@ jobs: path: dist/CursorFreeVIP_${{ env.VERSION }}_linux_x64 build-linux-arm64: - needs: create-tag + needs: [create-tag , determine-version] runs-on: ubuntu-latest steps: @@ -195,24 +195,13 @@ jobs: - name: Build in ARM64 Docker container run: | - docker run --rm --platform linux/arm64 -v ${{ github.workspace }}:/app -w /app -e VERSION=${{ env.VERSION }} arm64v8/python:3.10-slim bash -c " + docker run --rm --platform linux/arm64 -v ${{ github.workspace }}:/app -w /app arm64v8/python:3.10-slim bash -c " apt-get update && apt-get install -y build-essential pip install --upgrade pip pip install pyinstaller pip install -r requirements.txt python -m PyInstaller build.spec - # 检查生成的文件名 - ls -la /app/dist/ - # 使用正确的文件名进行移动 - if [ -f \"/app/dist/CursorFreeVIP_\${VERSION}_linux\" ]; then - mv \"/app/dist/CursorFreeVIP_\${VERSION}_linux\" \"/app/dist/CursorFreeVIP_\${VERSION}_linux_arm64\" - elif [ -f \"/app/dist/CursorFreeVIP_linux\" ]; then - mv \"/app/dist/CursorFreeVIP_linux\" \"/app/dist/CursorFreeVIP_\${VERSION}_linux_arm64\" - else - echo \"Error: Cannot find expected output file in dist directory\" - ls -la /app/dist/ - exit 1 - fi + mv /app/dist/CursorFreeVIP_${{ env.VERSION }}_linux /app/dist/CursorFreeVIP_${{ env.VERSION }}_linux_arm64 " echo "Contents of dist directory:" ls -la dist/ @@ -224,7 +213,7 @@ jobs: path: dist/CursorFreeVIP_${{ env.VERSION }}_linux_arm64 build-macos-intel: - needs: create-tag + needs: [create-tag , determine-version] runs-on: macos-latest steps: