Skip to content

Commit

Permalink
fix(CI/CD workflow): WIP armv7 now has /
Browse files Browse the repository at this point in the history
  • Loading branch information
MRColorR committed Oct 10, 2024
1 parent 72a6202 commit 6847ce7
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/release-on-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest] # Build for Linux, macOS, and Windows
architecture: [x64, arm64, armv7] # Target architectures
architecture: [x64, arm64, arm/v7] # Target architectures
exclude:
- os: macos-latest
architecture: armv7 # macOS doesn't support ARMv7
architecture: arm/v7 # macOS doesn't support arm/v7
- os: windows-latest
architecture: armv7 # Windows doesn't support ARMv7
architecture: arm/v7 # Windows doesn't support arm/v7

steps:
- name: Checkout the code
Expand All @@ -43,7 +43,7 @@ jobs:
# Runners supported architectures use normal build process
# Step: Install dependencies
- name: Install dependencies
if: matrix.os != 'ubuntu-latest' || (matrix.architecture != 'arm64' && matrix.architecture != 'armv7')
if: matrix.os != 'ubuntu-latest' || (matrix.architecture != 'arm64' && matrix.architecture != 'arm/v7')
shell: bash # Use bash shell for consistency
run: |
python -m pip install --upgrade pip
Expand All @@ -52,7 +52,7 @@ jobs:
# Step: Build with PyInstaller
- name: Build with PyInstaller
if: matrix.os != 'ubuntu-latest' || (matrix.architecture != 'arm64' && matrix.architecture != 'armv7')
if: matrix.os != 'ubuntu-latest' || (matrix.architecture != 'arm64' && matrix.architecture != 'arm/v7')
shell: bash
run: |
pyinstaller --onedir \
Expand All @@ -78,18 +78,18 @@ jobs:
# Runners unsupported architectures use docker build process
# Setup QEMU and Docker Buildx only for Ubuntu runners for arch not supported by runners
- name: Set up QEMU for cross-compilation
if: matrix.os == 'ubuntu-latest' && (matrix.architecture == 'arm64' || matrix.architecture == 'armv7')
if: matrix.os == 'ubuntu-latest' && (matrix.architecture == 'arm64' || matrix.architecture == 'arm/v7')
uses: docker/setup-qemu-action@v3
with:
platforms: all

- name: Set up Docker Buildx
if: matrix.os == 'ubuntu-latest' && (matrix.architecture == 'arm64' || matrix.architecture == 'armv7')
if: matrix.os == 'ubuntu-latest' && (matrix.architecture == 'arm64' || matrix.architecture == 'arm/v7')
uses: docker/setup-buildx-action@v3

# Use Docker for cross-architecture builds for arch not supported by runners
- name: Build with Docker for ARM architectures
if: matrix.os == 'ubuntu-latest' && (matrix.architecture == 'arm64' || matrix.architecture == 'armv7')
if: matrix.os == 'ubuntu-latest' && (matrix.architecture == 'arm64' || matrix.architecture == 'arm/v7')
run: |
docker build --file workflow-linux-arm64.dockerfile --platform linux/${{ matrix.architecture }} -t money4band-builder .
docker run --platform linux/${{ matrix.architecture }} --rm -v $(pwd)/dist:/app/dist money4band-builder
Expand Down

0 comments on commit 6847ce7

Please sign in to comment.