Skip to content

Commit 2ff7a6e

Browse files
committed
macos13: install Xcode CLT non-interactively (#3)
1 parent 8d101a1 commit 2ff7a6e

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

macos13/configure-base.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,17 @@ mkdir -p -- "$cache_dir"
1111
download "$cache_dir" https://static.rust-lang.org/rustup/rustup-init.sh 32a680a84cf76014915b3f8aa44e3e40731f3af92cd45eb0fcc6264fd257c428
1212
download "$cache_dir" https://github.com/actions/runner/releases/download/v2.321.0/actions-runner-osx-x64-2.321.0.tar.gz b2c91416b3e4d579ae69fc2c381fc50dbda13f1b3fcc283187e2c75d1b173072
1313
download "$cache_dir" https://astral.sh/uv/install.sh 47ead06f79eba7461fd113fc92dc0f191af7455418462fbbed21affa2a6c22e2
14+
download "$cache_dir" https://raw.githubusercontent.com/actions/runner-images/3d5f09a90fd475a3531b0ef57325aa7e27b24595/images/macos/scripts/build/install-xcode-clt.sh 2c90d2c76f2d375ef5404d67510894ebbf917940aef5017ebee4c6b8c10c42fb
1415
download "$cache_dir/homebrew" https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh 9ad0c8048f3f1a01d5f6610e0df347ceeae5879cf0aa51c1d987aa8aee740dca
1516

1617
>&2 echo '[*] Injecting init script'
1718
mkdir -p init
1819
inject_exfat init "$script_dir/macos13/init.sh"
1920
inject_exfat init "$cache_dir/rustup-init.sh"
2021
inject_exfat init/install-uv.sh "$cache_dir/install.sh"
22+
inject_exfat init "$cache_dir/install-xcode-clt.sh"
2123
inject_exfat init/install-homebrew.sh "$cache_dir/homebrew/install.sh"
22-
chmod +x init/rustup-init.sh init/install-uv.sh
24+
chmod +x init/rustup-init.sh init/install-uv.sh init/install-xcode-clt.sh init/install-homebrew.sh
2325

2426
>&2 echo '[*] Injecting GitHub Actions runner'
2527
# See also: <https://github.com/servo/servo/settings/actions/runners/new?arch=x64&os=linux>

macos13/init.sh

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
#!/usr/bin/env zsh
22
set -euo pipefail -o bsdecho
33

4-
# Install Homebrew, including Xcode CLT (Command Line Tools)
4+
# Install Xcode CLT (Command Line Tools) non-interactively
5+
# <https://github.com/actions/runner-images/blob/3d5f09a90fd475a3531b0ef57325aa7e27b24595/images/macos/scripts/build/install-xcode-clt.sh>
6+
sudo -i mkdir -p /var/root/utils
7+
sudo -i touch /var/root/utils/utils.sh
8+
sudo -i /Volumes/a/init/install-xcode-clt.sh
9+
10+
# Install Homebrew
511
NONINTERACTIVE=1 /Volumes/a/init/install-homebrew.sh
612

713
# Install rustup and the latest Rust

0 commit comments

Comments
 (0)