Skip to content

Build Arch64 Mac builds on M1 machines and prevent conflicts between outputted DMGs #136

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

Merged
sergeichestakov merged 11 commits into from
Oct 16, 2023
Merged

Build Arch64 Mac builds on M1 machines and prevent conflicts between outputted DMGs #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
bb0e23b
Explicitly set different dmgPaths for each arch in DMG maker
sergeichestakov Oct 13, 2023
00a34e2
Don't overwrite
sergeichestakov Oct 13, 2023
70e9bb5
debug
sergeichestakov Oct 13, 2023
499712d
More debug
sergeichestakov Oct 13, 2023
1f38b78
Explicitly pass architecture
sergeichestakov Oct 13, 2023
73a2cef
Try using new M1 runner
sergeichestakov Oct 13, 2023
cf9cc02
Exclude Linux for now
sergeichestakov Oct 13, 2023
c4f4996
whoops
sergeichestakov Oct 13, 2023
a10ab01
Use M1 for arm64 builds, Intel for x86
sergeichestakov Oct 13, 2023
4f7e424
rm logs
sergeichestakov Oct 14, 2023
82e43f3
Update publish workflow too
sergeichestakov Oct 14, 2023
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
11 changes: 9 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,19 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ macOS-latest, ubuntu-latest, windows-latest ]
os: [ macOS-13-xlarge, macOS-latest, ubuntu-latest, windows-latest ]
arch: [ x64, arm64 ]
# Exclude platforms we don't support
# Publishing artifacts for multiple Windows architectures has
# a bug which can cause the wrong architecture to be downloaded
# for an update, so until that is fixed, only build Windows x64
exclude:
- os: windows-latest
arch: arm64
# Only build arm64 builds on M1 and x86 builds on Intel Mac
- os: macOS-latest
arch: arm64
- os: macOS-13-xlarge
arch: x64

steps:
- uses: actions/checkout@v3
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,19 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ macOS-latest, ubuntu-latest, windows-latest ]
os: [ macOS-13-xlarge, macOS-latest, ubuntu-latest, windows-latest ]
arch: [ x64, arm64 ]
# Publishing artifacts for multiple Windows architectures has
# a bug which can cause the wrong architecture to be downloaded
# for an update, so until that is fixed, only build Windows x64
exclude:
- os: windows-latest
arch: arm64
# Only build arm64 builds on M1 and x86 builds on Intel Mac
- os: macOS-latest
arch: arm64
- os: macOS-13-xlarge
arch: x64

steps:
- uses: actions/checkout@v3
Expand Down
6 changes: 5 additions & 1 deletion forge.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ const osxNotarize =
const osxSign = osxNotarize ? {} : undefined;

if (!osxNotarize) {
// eslint-disable-next-line no-console
console.log(
'Notarytool credentials not passed, skipping sign and notarize step for OSX.',
);
Expand Down Expand Up @@ -45,6 +46,7 @@ module.exports = {
// node_modules are necessary, but we have to strip binaries
if (path.includes('node_modules')) {
const ignoreNodeBinaries = '/node_modules/\\.bin($|/)';

return path.match(ignoreNodeBinaries);
}

Expand Down Expand Up @@ -81,7 +83,9 @@ module.exports = {
config: {
name: 'Replit',
icon: './assets/logo.icns',
overwrite: true,
overwrite: false,
// Set a different path for each architecture to avoid conflicts when uploading
dmgPath: process.arch === 'arm64' ? 'Replit.dmg' : 'Replit-Intel.dmg',
Comment thread
sergeichestakov marked this conversation as resolved.
additionalDMGOptions: {
'background-color': '#0E1525',
},
Expand Down