Skip to content

Commit cc538ba

Browse files
tronicaltronical
committed
Remove support for x86-64 macOS binaries
GitHub is going to remove the free x86-64 macos runners, as per https://github.blog/changelog/2025-07-11-upcoming-changes-to-macos-hosted-runners-macos-latest-migration-and-xcode-support-policy-updates/
1 parent a159c15 commit cc538ba

File tree

9 files changed

+19
-92
lines changed

9 files changed

+19
-92
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ jobs:
233233
CARGO_PROFILE_DEV_DEBUG: 0
234234
strategy:
235235
matrix:
236-
os: [ubuntu-22.04, macos-13, windows-2022]
236+
os: [ubuntu-22.04, macos-14, windows-2022]
237237
runs-on: ${{ matrix.os }}
238238

239239
steps:
@@ -242,7 +242,7 @@ jobs:
242242
with:
243243
force-gcc-10: true
244244
- name: Install Qt
245-
if: runner.os != 'Windows'
245+
if: runner.os == 'Linux'
246246
uses: jurplel/install-qt-action@v4
247247
with:
248248
version: "5.15.2"

‎.github/workflows/cpp_package.yaml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,10 @@ jobs:
2828
CARGO_INCREMENTAL: false
2929
strategy:
3030
matrix:
31-
os: [ubuntu-22.04, macOS-13, macos-14, windows-2022]
31+
os: [ubuntu-22.04, macos-14, windows-2022]
3232
include:
3333
- os: ubuntu-22.04
3434
package_suffix: linux
35-
- os: macOS-13
36-
package_suffix: macos-x86_64
3735
- os: macos-14
3836
package_suffix: macos-aarch64
3937
- os: windows-2022
@@ -237,17 +235,14 @@ jobs:
237235
CARGO_INCREMENTAL: false
238236
strategy:
239237
matrix:
240-
os: [ubuntu-22.04, macOS-13, macos-14, windows-2022]
238+
os: [ubuntu-22.04, macos-14, windows-2022]
241239
include:
242240
- os: ubuntu-22.04
243241
package_suffix: Linux-x86_64
244242
cargo_target: x86_64-unknown-linux-gnu
245243
- os: ubuntu-22.04-arm
246244
package_suffix: Linux-aarch64
247245
cargo_target: aarch64-unknown-linux-gnu
248-
- os: macOS-13
249-
package_suffix: Darwin-x86_64
250-
cargo_target: x86_64-apple-darwin
251246
- os: macos-14
252247
package_suffix: Darwin-arm64
253248
cargo_target: aarch64-apple-darwin

‎.github/workflows/nightly_snapshot.yaml‎

Lines changed: 8 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -117,15 +117,15 @@ jobs:
117117
path: |
118118
bin
119119
120-
build_vscode_lsp_macos_x86_64:
120+
build_vscode_lsp_macos_aarch64_bundle:
121121
env:
122122
SLINT_NO_QT: 1
123-
runs-on: macos-13
123+
runs-on: macos-14
124124
steps:
125125
- uses: actions/checkout@v5
126126
- uses: ./.github/actions/setup-rust
127127
with:
128-
target: x86_64-apple-darwin
128+
target: aarch64-apple-darwin
129129
- name: Install cargo-bundle
130130
run: cargo install --version=0.6.0 cargo-bundle
131131
- name: Build Main LSP Bundle
@@ -135,68 +135,18 @@ jobs:
135135
run: |
136136
mkdir bin
137137
cp -a target/release/bundle/osx/Slint\ Live\ Preview.app bin
138-
- name: "Upload LSP Artifact"
139-
uses: actions/upload-artifact@v4
140-
with:
141-
name: vscode-lsp-binary-x86_64-apple-darwin
142-
path: |
143-
bin
144-
145-
build_vscode_lsp_macos_aarch64:
146-
env:
147-
SLINT_NO_QT: 1
148-
runs-on: macos-14
149-
steps:
150-
- uses: actions/checkout@v5
151-
- uses: ./.github/actions/setup-rust
152-
with:
153-
target: aarch64-apple-darwin
154-
- name: Build AArch64 LSP
155-
run: cargo build --target aarch64-apple-darwin --features ${{ env.SLINT_BINARY_FEATURES }} --release -p slint-lsp
156-
- name: Create artifact directory
157-
run: |
158-
mkdir bin
159-
cp -a target/aarch64-apple-darwin/release/slint-lsp bin/slint-lsp-aarch64-apple-darwin
160-
- name: "Upload LSP Artifact"
161-
uses: actions/upload-artifact@v4
162-
with:
163-
name: vscode-lsp-binary-aarch64-apple-darwin
164-
path: |
165-
bin
166-
167-
build_vscode_lsp_macos_bundle:
168-
needs: [build_vscode_lsp_macos_x86_64, build_vscode_lsp_macos_aarch64]
169-
runs-on: macos-13
170-
steps:
171-
- uses: actions/checkout@v5
138+
- uses: ./.github/actions/codesign
172139
with:
173-
path: "src"
174-
- uses: actions/download-artifact@v5
175-
with:
176-
name: vscode-lsp-binary-x86_64-apple-darwin
177-
- uses: actions/download-artifact@v5
178-
with:
179-
name: vscode-lsp-binary-aarch64-apple-darwin
180-
path: bin
181-
- name: Add macOS AArch64 binary to bundle
182-
run: |
183-
lipo -create -output tmp Slint\ Live\ Preview.app/Contents/MacOS/slint-lsp bin/slint-lsp-aarch64-apple-darwin
184-
mv tmp Slint\ Live\ Preview.app/Contents/MacOS/slint-lsp
185-
rm -rf bin
186-
- uses: ./src/.github/actions/codesign
187-
with:
188-
binary: "Slint Live Preview.app"
140+
binary: "bin/Slint Live Preview.app"
189141
certificate: ${{ secrets.APPLE_CERTIFICATE_P12 }}
190142
certificate_password: ${{ secrets.APPLE_CERTIFICATE_P12_PASSWORD }}
191143
keychain_password: ${{ secrets.APPLE_KEYCHAIN_PASSWORD }}
192144
developer_id: ${{ secrets.APPLE_DEV_ID }}
193-
- name: "Remove temporary source checkout"
194-
run: rm -rf src
195145
- name: "Upload LSP macOS bundle Artifact"
196146
uses: actions/upload-artifact@v4
197147
with:
198148
name: vscode-lsp-binary-darwin
199-
path: .
149+
path: bin
200150

201151
build_vscode_cross_linux_lsp:
202152
env:
@@ -232,11 +182,11 @@ jobs:
232182
needs:
233183
[
234184
build_vscode_lsp_linux_windows,
235-
build_vscode_lsp_macos_bundle,
185+
build_vscode_lsp_macos_aarch64_bundle,
236186
build_vscode_cross_linux_lsp,
237187
check-for-secrets,
238188
]
239-
runs-on: macos-13
189+
runs-on: macos-14
240190
if: ${{ needs.check-for-secrets.outputs.has-openvsx-pat == 'yes' && needs.check-for-secrets.outputs.has-vscode-marketplace-pat == 'yes' }}
241191
steps:
242192
- uses: actions/checkout@v5

‎.github/workflows/nightly_tests.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ jobs:
201201
uvx_slint_compiler:
202202
strategy:
203203
matrix:
204-
os: [ubuntu-22.04, ubuntu-22.04-arm, macos-13, macos-14, windows-2022, windows-11-arm]
204+
os: [ubuntu-22.04, ubuntu-22.04-arm, macos-14, windows-2022, windows-11-arm]
205205
runs-on: ${{ matrix.os }}
206206
steps:
207207
- uses: actions/checkout@v5

‎.github/workflows/publish_npm_package.yaml‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,6 @@ jobs:
6161
- os: ubuntu-22.04-arm
6262
rust-target: aarch64-unknown-linux-gnu
6363
napi-rs-target: linux-arm64-gnu
64-
- os: macos-13
65-
rust-target: x86_64-apple-darwin
66-
napi-rs-target: darwin-x64
6764
- os: macos-14
6865
rust-target: aarch64-apple-darwin
6966
napi-rs-target: darwin-arm64
@@ -195,11 +192,6 @@ jobs:
195192
with:
196193
name: binaries-aarch64-unknown-linux-gnu
197194
path: api/node/
198-
- name: Download artifacts
199-
uses: actions/download-artifact@v5
200-
with:
201-
name: binaries-x86_64-apple-darwin
202-
path: api/node/
203195
- name: Download artifacts
204196
uses: actions/download-artifact@v5
205197
with:
@@ -218,7 +210,7 @@ jobs:
218210
- name: Add binary dependencies
219211
working-directory: api/node
220212
run: |
221-
for package in @slint-ui/slint-ui-binary-linux-x64-gnu @slint-ui/slint-ui-binary-linux-arm64-gnu @slint-ui/slint-ui-binary-darwin-x64 @slint-ui/slint-ui-binary-darwin-arm64 @slint-ui/slint-ui-binary-win32-x64-msvc @slint-ui/slint-ui-binary-win32-arm64-msvc; do
213+
for package in @slint-ui/slint-ui-binary-linux-x64-gnu @slint-ui/slint-ui-binary-linux-arm64-gnu @slint-ui/slint-ui-binary-darwin-arm64 @slint-ui/slint-ui-binary-win32-x64-msvc @slint-ui/slint-ui-binary-win32-arm64-msvc; do
222214
jq --arg pkg "$package" --arg version "$PKG_VERSION" '.optionalDependencies[$pkg]=$version' package.json > new.json
223215
mv new.json package.json
224216
done
@@ -243,7 +235,6 @@ jobs:
243235
run: |
244236
pnpm publish --no-git-checks --access public $PUBLISH_TAG api/node/slint-ui-slint-ui-binary-linux-x64-gnu-$PKG_VERSION.tgz
245237
pnpm publish --no-git-checks --access public $PUBLISH_TAG api/node/slint-ui-slint-ui-binary-linux-arm64-gnu-$PKG_VERSION.tgz
246-
pnpm publish --no-git-checks --access public $PUBLISH_TAG api/node/slint-ui-slint-ui-binary-darwin-x64-$PKG_VERSION.tgz
247238
pnpm publish --no-git-checks --access public $PUBLISH_TAG api/node/slint-ui-slint-ui-binary-darwin-arm64-$PKG_VERSION.tgz
248239
pnpm publish --no-git-checks --access public $PUBLISH_TAG api/node/slint-ui-slint-ui-binary-win32-x64-msvc-$PKG_VERSION.tgz
249240
pnpm publish --no-git-checks --access public $PUBLISH_TAG api/node/slint-ui-slint-ui-binary-win32-arm64-msvc-$PKG_VERSION.tgz

‎.github/workflows/slint_tool_binary.yaml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -167,28 +167,23 @@ jobs:
167167
path: slint-${{ github.event.inputs.program || inputs.program }}-${{ matrix.target }}.tar.gz
168168

169169
build_macos:
170-
runs-on: macos-13
170+
runs-on: macos-14
171171
steps:
172172
- uses: actions/checkout@v5
173-
- uses: ./.github/actions/setup-rust
174-
with:
175-
target: x86_64-apple-darwin
176173
- uses: ./.github/actions/setup-rust
177174
with:
178175
target: aarch64-apple-darwin
179176
- uses: baptiste0928/cargo-install@v3
180177
with:
181178
crate: cargo-about
182179
version: "=0.6.6"
183-
- name: Build x86_64
184-
run: cargo build --verbose --target x86_64-apple-darwin --no-default-features --features ${{ github.event.inputs.features || inputs.features }} --release -p slint-${{ github.event.inputs.program || inputs.program }}
185180
- name: Build aarch64
186181
run: cargo build --verbose --target aarch64-apple-darwin --no-default-features --features ${{ github.event.inputs.features || inputs.features }} --release -p slint-${{ github.event.inputs.program || inputs.program }}
187182
- name: Create artifact directory
188183
run: |
189184
mkdir -p slint-${{ github.event.inputs.program || inputs.program }}
190185
cd slint-${{ github.event.inputs.program || inputs.program }}
191-
lipo -create -output ./slint-${{ github.event.inputs.program || inputs.program }} ../target/x86_64-apple-darwin/release/slint-${{ github.event.inputs.program || inputs.program }} ../target/aarch64-apple-darwin/release/slint-${{ github.event.inputs.program || inputs.program }}
186+
lipo -create -output ./slint-${{ github.event.inputs.program || inputs.program }} ../target/aarch64-apple-darwin/release/slint-${{ github.event.inputs.program || inputs.program }}
192187
install_name_tool -add_rpath @executable_path/. ./slint-${{ github.event.inputs.program || inputs.program }}
193188
cd ..
194189
cd tools/${{ github.event.inputs.program || inputs.program }}

‎.github/workflows/upload_pypi.yaml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ jobs:
2626
# - runner: windows-11-arm
2727
# target: aarch64
2828
# container: auto
29-
- runner: macos-13
30-
target: x86_64
31-
container: auto
3229
- runner: macos-14
3330
target: aarch64
3431
container: auto

‎api/node/binaries.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
"additional": [
1010
"x86_64-unknown-linux-gnu",
1111
"aarch64-unknown-linux-gnu",
12-
"x86_64-apple-darwin",
1312
"aarch64-apple-darwin",
1413
"x86_64-pc-windows-msvc",
1514
"aarch64-pc-windows-msvc"

‎docs/astro/src/content/docs/guide/platforms/desktop.mdx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ rustflags = ["-C", "link-arg=/STACK:8000000"]
8989

9090
| Operating System | Architecture |
9191
| ----------------- | --------------- |
92-
| macOS 13 Ventura | x86-64, aarch64 |
93-
| macOS 14 Sonoma | x86-64, aarch64 |
94-
| macOS 15 Sequoia | x86-64, aarch64 |
92+
| macOS 14 Sonoma | aarch64 |
93+
| macOS 15 Sequoia | aarch64 |
94+
| macOS 26 | aarch64 |
9595

9696
</TabItem>
9797
<TabItem label="Linux" icon="linux">

0 commit comments

Comments
 (0)