Fix build errors

laggykiller · Jan 12, 2025 · 03bda1f · 03bda1f
1 parent 79f56d7
commit 03bda1f
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -47,7 +47,6 @@ jobs:
       matrix:
         include:
           # - os: windows-2022
-          #   IMG: 'docker://debian:10'
           #   TARGET: windows
           #   CMD_BUILD: |
           #       python compile.py
@@ -62,31 +61,27 @@ jobs:
           #     ./sticker-convert-windows-x86_64.zip
           #     ./sticker-convert-windows-x86_64.msi
           # - os: macos-13
-          #   IMG: 'docker://debian:10'
           #   TARGET: macos-x86_64
           #   CMD_BUILD: |
           #       python ./compile.py
           #       cp ./scripts/hold_control_and_click_open_me_first.command ./
           #       zip -r9 sticker-convert-macos-x86_64.zip sticker-convert.app hold_control_and_click_open_me_first.command
           #   OUT_FILE_NAME: ./sticker-convert-macos-x86_64.zip
           # - os: macos-14
-          #   IMG: 'docker://debian:10'
           #   TARGET: macos-arm64
           #   CMD_BUILD: |
           #       python ./compile.py
           #       cp ./scripts/hold_control_and_click_open_me_first.command ./
           #       zip -r9 sticker-convert-macos-arm64.zip sticker-convert.app hold_control_and_click_open_me_first.command
           #   OUT_FILE_NAME: ./sticker-convert-macos-arm64.zip
           - os: ubuntu-20.04
-            IMG: 'docker://quay.io/pypa/manylinux2014_x86_64'
             TARGET: linux-x86_64
             CMD_BUILD: |
                 python ./compile.py
                 zip -r9 sticker-convert-linux-x86_64.zip ./sticker-convert.dist/*
                 SC_COMPILE_ARCH=x86_64 ./scripts/build_appimage.sh
             OUT_FILE_NAME: ./sticker-convert-x86_64.AppImage
           - os: ubuntu-20.04
-            IMG: 'docker://quay.io/pypa/manylinux2014_aarch64'
             TARGET: linux-aarch64
             CMD_BUILD: |
                 python ./compile.py
@@ -107,9 +102,14 @@ jobs:
       with:
         python-version: "3.12"
         allow-prereleases: true
-    - name: Build for ${{matrix.TARGET}} (Linux)
-      if: runner.os == 'Linux'
-      uses: ${{matrix.IMG}}
+    - name: Build for ${{matrix.TARGET}} (linux-x86_64)
+      if: runner.TARGET == 'linux-x86_64'
+      uses: docker://quay.io/pypa/manylinux2014_x86_64
+      with:
+        args: ${{matrix.CMD_BUILD}}
+    - name: Build for ${{matrix.TARGET}} (linux-aarch64)
+      if: runner.TARGET == 'linux-aarch64'
+      uses: docker://quay.io/pypa/manylinux2014_aarch64
       with:
         args: ${{matrix.CMD_BUILD}}
     - name: Build for ${{matrix.TARGET}}