diff --git a/.github/workflow_data/release.py b/.github/workflow_data/release.py index 9f935ee6..c11920f5 100644 --- a/.github/workflow_data/release.py +++ b/.github/workflow_data/release.py @@ -18,7 +18,7 @@ ).json() print(f"release = {json.dumps(release, indent=4)}") body = "## ⬇️ Download\n" - for asset_type, asset_icon in [("Windows", "🪟"), ("Linux", "🐧"), ("MacOS", "🍎"), ("Source", "🐍")]: + for asset_type, asset_icon in [("Windows", "🪟"), ("Linux", "🐧"), ("macOS-x64", "🍎"), ("macOS-arm64", "🍎"), ("Source", "🐍")]: print(f"Adding {asset_type}") for asset in release["assets"]: if asset_type.lower() in asset["name"].lower(): diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 46781408..a177c908 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,9 +14,10 @@ jobs: fail-fast: false matrix: config: - - { os: "windows-2022", python: "3.12.4", cx-freeze: "7.0.0", cx-logging: "v3.2.0", astcenc: "5.1.0", compressonator: "4.5.52" } - - { os: "ubuntu-22.04", python: "3.12.4", cx-freeze: "7.0.0", cx-logging: "" , astcenc: "5.1.0", compressonator: "4.5.52" } - - { os: "macos-15-intel", python: "3.12.4", cx-freeze: "7.0.0", cx-logging: "" , astcenc: "5.1.0", compressonator: "" } + - { os: "windows-2022", python: "3.12.4", cx-freeze: "7.0.0", cx-logging: "v3.2.0", astcenc: "5.1.0", compressonator: "4.5.52", artifact: "Windows" } + - { os: "ubuntu-22.04", python: "3.12.4", cx-freeze: "7.0.0", cx-logging: "", astcenc: "5.1.0", compressonator: "4.5.52", artifact: "Linux" } + - { os: "macos-15-intel", python: "3.12.4", cx-freeze: "7.0.0", cx-logging: "", astcenc: "5.1.0", compressonator: "", artifact: "macOS-x64" } + - { os: "macos-15", python: "3.12.4", cx-freeze: "7.0.0", cx-logging: "", astcenc: "5.1.0", compressonator: "", artifact: "macOS-arm64" } name: "${{ matrix.config.os }}" runs-on: "${{ matrix.config.os }}" if: "github.event_name != 'push' || contains(github.event.head_commit.message, '+ BUILD')" @@ -150,14 +151,14 @@ jobs: - name: "Zip artifact" run: | cd ./dist/ - 7z a ../${{ github.event.repository.name }}-${{ runner.os }}.zip . + 7z a ../${{ github.event.repository.name }}-${{ matrix.config.artifact }}.zip . - name: "Upload commit artifact" if: "github.event_name != 'release'" uses: "actions/upload-artifact@v4" with: - name: "${{ github.event.repository.name }}-${{ runner.os }}-Artifact" - path: "./${{ github.event.repository.name }}-${{ runner.os }}.zip" + name: "${{ github.event.repository.name }}-${{ matrix.config.artifact }}-Artifact" + path: "./${{ github.event.repository.name }}-${{ matrix.config.artifact }}.zip" compression-level: 0 - name: "Upload release artifact" @@ -166,7 +167,7 @@ jobs: env: GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" with: - files: "./${{ github.event.repository.name }}-${{ runner.os }}.zip" + files: "./${{ github.event.repository.name }}-${{ matrix.config.artifact }}.zip" source: name: "source" diff --git a/CHANGELOG.md b/CHANGELOG.md index 01c8a740..67074307 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - Saves a lot of VRAM if completely disabled, no GIFs play and only first frame is loaded - Saves CPU/GPU usage by redrawing less if disabled when unfocused, but still uses same VRAM - Tabs can now be reordered by dragging (by @WillyJL) +- macOS arm64 (Apple Silicon) binary builds (#258 by @rakleed) ### Updated: - New notification system with buttons and better platform support, option to include banner image in update notifs (#220 by @WillyJL)