diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 474ce4d..10a96c9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,6 +23,12 @@ jobs: os: macos-latest ffmpeg: node_modules/ffmpeg-static/ffmpeg installer: release/*.dmg + # Intel Macs get an installer of their own, built on one of GitHub's Intel Macs: ffmpeg-static and the + # capture helper both come out for the machine they are built on, so everything in it is Intel. + - name: macOS Intel + os: macos-15-intel + ffmpeg: node_modules/ffmpeg-static/ffmpeg + installer: release/*.dmg - name: Windows os: windows-latest ffmpeg: node_modules/ffmpeg-static/ffmpeg.exe diff --git a/AGENTS.md b/AGENTS.md index 54f7fdc..9c26db0 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -452,8 +452,9 @@ Do not write test data there. release workflow leaves them out (`DJMASTER_SKIP_WINDOW_TESTS`) until that trial has shown them to be dependable there. - **Releases are built by GitHub.** Pushing a tag such as `v0.2.0` runs - `.github/workflows/release.yml`, which tests and packages on macOS, - Windows and Linux and publishes the three installers. The version comes + `.github/workflows/release.yml`, which tests and packages on macOS (an + Apple Silicon machine and an Intel one, each building its own `.dmg`), + Windows and Linux and publishes the four installers. The version comes from the tag. None is signed for distribution. - **A package for the Microsoft Store** (`.msix`) is built beside the Windows installer and kept with the workflow run, under its downloads, not put on diff --git a/CHANGELOG.md b/CHANGELOG.md index db853fb..3b72a7c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ The changes in each release of DJ Mix Master that someone using it would notice. The website shows this list; changes that are not yet in a release are under "Not released yet" and appear there once they are. +## Not released yet + +- **A download for Intel Macs.** Macs with an Intel processor have an + installer of their own, beside the one for Apple Silicon. + ## 0.13.1 — 25 October 2026 - **On Windows the window has no title bar of its own**, as on the Mac: the diff --git a/README.md b/README.md index 9173ac4..dae0e97 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ free; if it helps you, you can [sponsor it](https://github.com/sponsors/Suva). ## Download and install -Installers for macOS (Apple Silicon), Windows and Linux are on the +Installers for macOS (Apple Silicon and Intel), Windows and Linux are on the [website](https://dmm.clysuva.com/) and the [releases page](https://github.com/Suva/djmixmaster/releases); on Windows it is also in the @@ -26,9 +26,6 @@ are not signed, so each system warns about them the first time; the manual's says how to get past that. What changed in each release is in [CHANGELOG.md](CHANGELOG.md). -There is no build for Intel Macs yet. On those, the tool can be run -[from source](#running-from-source). - ## The manual The [manual](https://dmm.clysuva.com/manual/) covers every part diff --git a/TASKS.md b/TASKS.md index 1635b50..bc2bc34 100644 --- a/TASKS.md +++ b/TASKS.md @@ -106,14 +106,6 @@ https://dmm.clysuva.com/, republished after every release. - Update the screenshot in `site/` when the window changes noticeably. See the AGENTS.md section on the website for how it is taken. -### Intel and universal Mac builds — small - -The packaged app does not run on Intel Macs. - -- Build for `x64` or as a universal app. -- The bundled ffmpeg has to match: `ffmpeg-static` installs one binary for - the machine it is installed on, so the other has to be fetched as well. - ### A native ARM64 build for Windows — medium, needs an ARM machine to test The Windows installer and the Microsoft Store package are x64 only, and the diff --git a/package.json b/package.json index e18ee05..50ae578 100644 --- a/package.json +++ b/package.json @@ -51,6 +51,7 @@ "target": [ "dmg" ], + "artifactName": "${productName}-${version}-${arch}.${ext}", "category": "public.app-category.music", "icon": "build/icon.icns", "identity": "-", diff --git a/scripts/build-site.mjs b/scripts/build-site.mjs index 1a60d19..53e4e37 100644 --- a/scripts/build-site.mjs +++ b/scripts/build-site.mjs @@ -26,7 +26,10 @@ const escape = (text) => text.replace(/&/g, '&').replace(/ release?.assets.find((a) => a.name.endsWith(extension)); -const mac = asset('.dmg'); +// The Intel installer's name ends in -x64.dmg; the Apple Silicon one is the other .dmg (in older releases its name +// has no -arm64 at the end). +const macIntel = asset('-x64.dmg'); +const mac = release?.assets.find((a) => a.name.endsWith('.dmg') && a !== macIntel); const windows = asset('.exe'); const linux = asset('.AppImage'); @@ -41,6 +44,8 @@ const values = { VERSION_LINE: version, MAC_URL: mac?.browser_download_url ?? releasesUrl, MAC_DETAIL: mac ? `Apple Silicon · ${megabytes(mac.size)}` : 'Apple Silicon', + MAC_INTEL_URL: macIntel?.browser_download_url ?? releasesUrl, + MAC_INTEL_DETAIL: macIntel ? `Intel · ${megabytes(macIntel.size)}` : 'Intel', WINDOWS_URL: windows?.browser_download_url ?? releasesUrl, WINDOWS_DETAIL: windows ? `64-bit · ${megabytes(windows.size)}` : '64-bit', LINUX_URL: linux?.browser_download_url ?? releasesUrl, diff --git a/site/index.html b/site/index.html index f53a6a9..616291f 100644 --- a/site/index.html +++ b/site/index.html @@ -26,6 +26,7 @@
Open a recording of a set or a whole night, mark the mix inside it, and get it back with every track at the same loudness. Louder tracks come down, quieter ones come up, and the breakdowns keep their dip.
Needs a Mac with Apple Silicon and macOS 13 or later.
+Needs macOS 13 or later. There is one download for Macs with Apple Silicon (M1 or later) and one for Macs with an Intel processor.