Skip to content

Commit

Permalink
Merge pull request #469 from loathingKernel/develop
Browse files Browse the repository at this point in the history
workflows: build both arm64 and x86_64 versions on MacOS
  • Loading branch information
loathingKernel authored Oct 12, 2024
2 parents b2f6b36 + 219a02c commit 5f9adfc
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 10 deletions.
1 change: 1 addition & 0 deletions .github/workflows/job_nuitka-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ jobs:
run: >-
python -m nuitka
--assume-yes-for-downloads
--clang
--lto=no
--jobs=4
--static-libpython=no
Expand Down
14 changes: 9 additions & 5 deletions .github/workflows/job_nuitka-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ on:

jobs:
build:
name: Build
strategy:
matrix:
arch: [ "arm64", "x86_64" ]
name: Build ${{ matrix.arch }}
runs-on: "macos-latest"
steps:
- uses: actions/checkout@v4
Expand All @@ -27,7 +30,7 @@ jobs:
pip3 install -r requirements-presence.txt
- name: Build
run: >-
python -m nuitka
arch -${{ matrix.arch }} python -m nuitka
--assume-yes-for-downloads
--clang
--lto=no
Expand Down Expand Up @@ -62,10 +65,11 @@ jobs:
rare
- name: Compress
run: |
python -c "import shutil; shutil.make_archive('Rare', 'zip', 'rare.dist')"
python -c "import shutil; shutil.make_archive('Rare-${{ matrix.arch }}', 'zip', 'rare.dist')"
- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: Rare-portable-macos-${{ inputs.version }}.zip
path: Rare.zip
name: Rare-portable-macos-${{ matrix.arch }}-${{ inputs.version }}.zip
path: Rare-${{ matrix.arch }}.zip

2 changes: 1 addition & 1 deletion .github/workflows/job_nuitka-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
run: >-
python -m nuitka
--assume-yes-for-downloads
--msvc=latest
--clang
--lto=no
--jobs=4
--static-libpython=no
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,10 @@ jobs:
uses: ./.github/workflows/job_publish.yml
with:
version: ${{ github.ref_name }}
file1: Rare.zip
name1: Rare-portable-macos-${{ github.ref_name }}.zip
file1: Rare-arm64.zip
name1: Rare-portable-macos-arm64-${{ github.ref_name }}.zip
file2: Rare-x86_64.zip
name2: Rare-portable-macos-x86_64-${{ github.ref_name }}.zip

cx-freeze-msi:
name: cx-Freeze msi
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,10 @@ jobs:
uses: ./.github/workflows/job_publish.yml
with:
version: ${{ needs.version.outputs.version }}
file1: Rare.zip
name1: Rare-portable-macos-${{ needs.version.outputs.version }}.zip
file1: Rare-arm64.zip
name1: Rare-portable-macos-arm64-${{ needs.version.outputs.version }}.zip
file2: Rare-x86_64.zip
name2: Rare-portable-macos-x86_64-${{ needs.version.outputs.version }}.zip

cx-freeze-msi:
needs: version
Expand Down

0 comments on commit 5f9adfc

Please sign in to comment.