Skip to content

Commit 01a96bb

Browse files
committed
Use native ARM runner for Apple Silicon builds
Change-type: minor
1 parent 2e3a75e commit 01a96bb

File tree

3 files changed

+9
-11
lines changed

3 files changed

+9
-11
lines changed

.github/actions/publish/action.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ runs:
2727
- name: Download custom source artifact
2828
uses: actions/download-artifact@v4
2929
with:
30-
name: custom-${{ github.event.pull_request.head.sha || github.event.head_commit.id }}-${{ runner.os }}
30+
name: custom-${{ github.event.pull_request.head.sha || github.event.head_commit.id }}-${{ runner.os }}-${{ runner.arch }}
3131
path: ${{ runner.temp }}
3232

3333
- name: Extract custom source artifact
@@ -122,29 +122,27 @@ runs:
122122
fi
123123
124124
APPLICATION_VERSION="$(jq -r '.version' package.json)"
125+
HOST_ARCH="$(echo "${RUNNER_ARCH}" | tr '[:upper:]' '[:lower:]')"
125126
126127
if [[ "${RUNNER_OS}" == Linux ]]; then
127128
PLATFORM=Linux
128-
BUILD_ARCHS="x64"
129129
SHA256SUM_BIN=sha256sum
130130
131131
elif [[ "${RUNNER_OS}" == macOS ]]; then
132132
PLATFORM=Darwin
133-
BUILD_ARCHS="x64,arm64"
134133
SHA256SUM_BIN='shasum -a 256'
135134
136135
elif [[ "${RUNNER_OS}" == Windows ]]; then
137136
PLATFORM=Windows
138137
SHA256SUM_BIN=sha256sum
139-
#BUILD_ARCHS="ia32,x64" -- distutils fails to build for ia32
140-
BUILD_ARCHS="x64"
141138
142139
else
143140
echo "ERROR: unexpected runner OS: ${RUNNER_OS}"
144141
exit 1
145142
fi
146143
147-
npx electron-forge make --arch="${BUILD_ARCHS}"
144+
# Currently, we can only build for the host architecture.
145+
npx electron-forge make
148146
149147
echo "version=${APPLICATION_VERSION}" >> $GITHUB_OUTPUT
150148
@@ -162,7 +160,7 @@ runs:
162160
if [[ -n "${SHA256SUM_BIN}" ]]; then
163161
# Compute and save digests.
164162
cd dist/
165-
${SHA256SUM_BIN} *.* >"SHA256SUMS.${PLATFORM}.txt"
163+
${SHA256SUM_BIN} *.* >"SHA256SUMS.${PLATFORM}.${HOST_ARCH}.txt"
166164
fi
167165
env:
168166
# ensure we sign the artifacts
@@ -181,7 +179,7 @@ runs:
181179
- name: Upload artifacts
182180
uses: actions/upload-artifact@v4
183181
with:
184-
name: gh-release-${{ github.event.pull_request.head.sha || github.event.head_commit.id }}-${{ runner.os }}
182+
name: gh-release-${{ github.event.pull_request.head.sha || github.event.head_commit.id }}-${{ runner.os }}-${{ runner.arch }}
185183
path: dist
186184
retention-days: 1
187185
if-no-files-found: error

.github/actions/test/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ inputs:
1212
# --- custom environment
1313
NODE_VERSION:
1414
type: string
15-
default: "18.x"
15+
default: "18.18"
1616
VERBOSE:
1717
type: string
1818
default: "true"
@@ -77,6 +77,6 @@ runs:
7777
- name: Upload custom artifact
7878
uses: actions/upload-artifact@v4
7979
with:
80-
name: custom-${{ github.event.pull_request.head.sha || github.event.head_commit.id }}-${{ runner.os }}
80+
name: custom-${{ github.event.pull_request.head.sha || github.event.head_commit.id }}-${{ runner.os }}-${{ runner.arch }}
8181
path: ${{ runner.temp }}/custom.tgz
8282
retention-days: 1

.github/workflows/flowzone.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
(github.event.pull_request.head.repo.full_name != github.repository && github.event_name == 'pull_request_target')
1919
secrets: inherit
2020
with:
21-
tests_run_on: '["ubuntu-20.04","macos-12","windows-2019"]'
21+
tests_run_on: '["ubuntu-20.04","windows-2019","macos-12","macos-latest-xlarge"]'
2222
restrict_custom_actions: false
2323
github_prerelease: true
2424
cloudflare_website: "etcher"

0 commit comments

Comments
 (0)