diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 14ac850ab..3357bf74a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -87,17 +87,7 @@ jobs: gh release upload ${{ github.ref_name }} H7CAD-${{ github.ref_name }}-windows-x86_64.exe --clobber --repo ${{ github.repository }} build-macos: - strategy: - fail-fast: false - matrix: - include: - - runner: macos-14 # Apple Silicon (arm64) - target: aarch64-apple-darwin - arch: arm64 - - runner: macos-13 # Intel (x86_64) - target: x86_64-apple-darwin - arch: x86_64 - runs-on: ${{ matrix.runner }} + runs-on: macos-14 # Apple Silicon (arm64) only permissions: contents: write @@ -108,7 +98,7 @@ jobs: - name: Install Rust uses: dtolnay/rust-toolchain@stable with: - targets: ${{ matrix.target }} + targets: aarch64-apple-darwin - name: Install librsvg (for rsvg-convert) env: @@ -116,7 +106,7 @@ jobs: run: brew install librsvg - name: Build - run: cargo build --release --target ${{ matrix.target }} + run: cargo build --release --target aarch64-apple-darwin - name: Build .icns from SVG run: | @@ -137,7 +127,7 @@ jobs: APP=H7CAD.app rm -rf "$APP" mkdir -p "$APP/Contents/MacOS" "$APP/Contents/Resources" - cp target/${{ matrix.target }}/release/H7CAD "$APP/Contents/MacOS/H7CAD" + cp target/aarch64-apple-darwin/release/H7CAD "$APP/Contents/MacOS/H7CAD" chmod +x "$APP/Contents/MacOS/H7CAD" cp AppIcon.icns "$APP/Contents/Resources/AppIcon.icns" # Substitute version into Info.plist. @@ -159,5 +149,5 @@ jobs: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - mv H7CAD.dmg H7CAD-${{ github.ref_name }}-macos-${{ matrix.arch }}.dmg - gh release upload ${{ github.ref_name }} H7CAD-${{ github.ref_name }}-macos-${{ matrix.arch }}.dmg --clobber --repo ${{ github.repository }} + mv H7CAD.dmg H7CAD-${{ github.ref_name }}-macos-arm64.dmg + gh release upload ${{ github.ref_name }} H7CAD-${{ github.ref_name }}-macos-arm64.dmg --clobber --repo ${{ github.repository }} diff --git a/README.md b/README.md index 4ea4588e3..1371ddcb2 100644 --- a/README.md +++ b/README.md @@ -116,12 +116,9 @@ No installation required — runs directly on any modern Linux distribution. Download `H7CAD-*-windows-x86_64.exe` from the [latest release](https://github.com/HakanSeven12/H7CAD/releases/latest) and run it directly. Windows SmartScreen may show "Windows protected your PC" because the binary is not yet code-signed — click **More info → Run anyway**. -### macOS +### macOS (Apple Silicon) -Download the matching `.dmg` from the [latest release](https://github.com/HakanSeven12/H7CAD/releases/latest): - -- Apple Silicon: `H7CAD-*-macos-arm64.dmg` -- Intel: `H7CAD-*-macos-x86_64.dmg` +Download `H7CAD-*-macos-arm64.dmg` from the [latest release](https://github.com/HakanSeven12/H7CAD/releases/latest) — Apple Silicon (M-series) only; Intel macOS isn't built. Open the .dmg and drag `H7CAD.app` to `/Applications`. The first launch may be blocked by Gatekeeper because the app is not notarised — right-click `H7CAD.app → Open` and confirm, or run once via `xattr -dr com.apple.quarantine /Applications/H7CAD.app`.