Skip to content

fix: replace retired macos-13 runner with macos-15-intel for Intel x64 builds #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Copilot wants to merge 3 commits into from
Closed

fix: replace retired macos-13 runner with macos-15-intel for Intel x64 builds #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac5fbdd
Initial plan
Copilot Mar 4, 2026
1012e91
fix: replace deprecated macos-13 runner with macos-15-intel for Intel…
Copilot Mar 4, 2026
7e8e98a
fix: add ruff to dev deps and fix all lint/format issues so CI lint j…
Copilot Mar 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 62 additions & 11 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,38 @@ on:
- Main

jobs:
# ── 1. Run test suite ──────────────────────────────────────────────────────
# ── 1. Lint ──────────────────────────────────────────────────────────────
lint:
name: Lint
runs-on: ubuntu-latest
permissions:
contents: read

steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Install uv
uses: astral-sh/setup-uv@v5
with:
enable-cache: true

- name: Set up Python 3.13
run: uv python install 3.13

- name: Install dependencies (incl. dev)
run: uv sync --all-groups

- name: Ruff — lint
run: uv run ruff check .

- name: Ruff — format check
run: uv run ruff format --check .

# ── 2. Run test suite ──────────────────────────────────────────────────────
test:
name: Run Tests
needs: lint
runs-on: macos-latest
permissions:
checks: write
Expand Down Expand Up @@ -41,11 +70,28 @@ jobs:
reporter: java-junit
fail-on-error: false

# ── 2. Build macOS app (only when tests pass) ──────────────────────────────
# ── 2. Build per platform (only when tests pass) ──────────────────────────
build:
name: Build macOS App
name: Build — ${{ matrix.os-label }}
needs: test
runs-on: macos-latest
runs-on: ${{ matrix.runner }}
permissions:
contents: read
strategy:
fail-fast: false
matrix:
include:
- runner: macos-14
os-label: macOS ARM (Apple Silicon)
artifact: MultiChannelWavMixer-macOS-arm64.zip

- runner: macos-15-intel
os-label: macOS x64 (Intel)
artifact: MultiChannelWavMixer-macOS-x64.zip

- runner: windows-latest
os-label: Windows x64
artifact: MultiChannelWavMixer-Windows-x64.zip

steps:
- name: Checkout code
Expand All @@ -62,17 +108,22 @@ jobs:
- name: Install dependencies (incl. dev)
run: uv sync --all-groups

- name: Build app with PyInstaller
run: bash build.sh
- name: Build with PyInstaller (macOS)
if: runner.os == 'macOS'
run: |
uv run pyinstaller MultiChannelWavMixer.spec --noconfirm --log-level WARN
cd dist && zip -r ${{ matrix.artifact }} MultiChannelWavMixer.app

- name: Zip app bundle
- name: Build with PyInstaller (Windows)
if: runner.os == 'Windows'
shell: pwsh
run: |
cd dist
zip -r MultiChannelWavMixer.zip MultiChannelWavMixer.app
uv run pyinstaller MultiChannelWavMixer.spec --noconfirm --log-level WARN
Compress-Archive -Path dist\MultiChannelWavMixer -DestinationPath dist\${{ matrix.artifact }}

- name: Upload build artifact
uses: actions/upload-artifact@v4
with:
name: MultiChannelWavMixer-macOS
path: dist/MultiChannelWavMixer.zip
name: ${{ matrix.artifact }}
path: dist/${{ matrix.artifact }}
retention-days: 30
29 changes: 20 additions & 9 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,16 @@ jobs:
id: cz_manual
if: github.event_name == 'workflow_dispatch'
run: |
uv run cz bump --yes --exact-version ${{ inputs.version }}
echo "bumped=true" >> "$GITHUB_OUTPUT"
echo "new_version=${{ inputs.version }}" >> "$GITHUB_OUTPUT"
VERSION="${{ inputs.version }}"
# Update version in pyproject.toml if it differs
sed -i "s/^version = \".*\"/version = \"${VERSION}\"/" pyproject.toml
if ! git diff --quiet pyproject.toml; then
git add pyproject.toml
git commit -m "bump: release v${VERSION}"
fi
git tag -a "v${VERSION}" -m "Release v${VERSION}"
echo "bumped=true" >> "$GITHUB_OUTPUT"
Comment on lines +58 to +61

Copilot AI Mar 4, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

git tag -a "v${VERSION}" will fail if the tag already exists (e.g., re-running a workflow_dispatch with the same version, or leaving the default input). Consider checking for an existing tag before creating it and either (a) exiting with a clear message / setting bumped=false, or (b) deleting/replacing the tag explicitly if that’s intended.

Copilot uses AI. Check for mistakes.

@MacBuchi MacBuchi Mar 4, 2026

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@copilot Ruf is not available, this is properly configured on dev branch (pyproject.toml)

Copilot AI Mar 4, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added ruff>=0.9 to the dev dependencies in pyproject.toml along with the full [tool.ruff] configuration (matching the dev branch). Also fixed all lint and format issues in the source files so the CI lint job now passes. Commit: 7e8e98a.

echo "new_version=${VERSION}" >> "$GITHUB_OUTPUT"

# ── Auto: derive version from conventional commits ────────────────────
# Exit code 21 = "nothing to release" — treated as success (no-op).
Expand Down Expand Up @@ -102,13 +109,17 @@ jobs:
fail-fast: false
matrix:
include:
- runner: macos-latest
os-label: macOS
artifact: MultiChannelWavMixer-macOS.zip
- runner: macos-14
os-label: macOS ARM (Apple Silicon)
artifact: MultiChannelWavMixer-macOS-arm64.zip

- runner: macos-15-intel
os-label: macOS x64 (Intel)
artifact: MultiChannelWavMixer-macOS-x64.zip

- runner: windows-latest
os-label: Windows
artifact: MultiChannelWavMixer-Windows.zip
- runner: windows-latest
os-label: Windows x64
artifact: MultiChannelWavMixer-Windows-x64.zip

steps:
- name: Checkout code at new tag
Expand Down
Loading
Loading