macos13: base image scripts (#3)

Author: delan

download.sh

@@ -5,6 +5,7 @@ set -euo pipefail -o bsdecho
 download() {
     local dest_path=$1/${2##*/}
     local expected=${3-0000000000000000000000000000000000000000000000000000000000000000}
+    mkdir -p -- "$1"
     [ -e "$dest_path" ] || curl -Lo "$dest_path" -- "$2"
     if ! printf '%s  %s\n' "$expected" "$dest_path" | sha256sum -c; then
         >&2 printf 'Expected sha256: %s\n' "$expected"

inject.sh

@@ -6,3 +6,10 @@ inject() (
     dest=$1; shift
     rsync -a --no-i-r --info=progress2 -- "$@" "$dest"
 )
+
+inject_exfat() (
+    dest=$1; shift
+    # Skip owners, groups, and links (for exFAT)
+    # FIXME: are macOS Servo builds ok with this?
+    rsync -a --no-o --no-g --no-l --no-i-r --info=progress2 -- "$@" "$dest"
+)

macos13/configure-base.sh

@@ -0,0 +1,42 @@
+#!/usr/bin/env zsh
+# usage: configure-base.sh
+script_dir=${0:a:h}/..
+. "$script_dir/common.sh"
+cache_dir=$script_dir/cache
+. "$script_dir/download.sh"
+. "$script_dir/inject.sh"
+
+>&2 echo '[*] Caching downloads'
+mkdir -p -- "$cache_dir"
+download "$cache_dir" https://static.rust-lang.org/rustup/rustup-init.sh 32a680a84cf76014915b3f8aa44e3e40731f3af92cd45eb0fcc6264fd257c428
+download "$cache_dir" https://github.com/actions/runner/releases/download/v2.321.0/actions-runner-osx-x64-2.321.0.tar.gz b2c91416b3e4d579ae69fc2c381fc50dbda13f1b3fcc283187e2c75d1b173072
+download "$cache_dir" https://astral.sh/uv/install.sh 47ead06f79eba7461fd113fc92dc0f191af7455418462fbbed21affa2a6c22e2
+download "$cache_dir/homebrew" https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh 9ad0c8048f3f1a01d5f6610e0df347ceeae5879cf0aa51c1d987aa8aee740dca
+
+>&2 echo '[*] Injecting init script'
+mkdir -p init
+inject_exfat init "$script_dir/macos13/init.sh"
+inject_exfat init "$cache_dir/rustup-init.sh"
+inject_exfat init/install-uv.sh "$cache_dir/install.sh"
+inject_exfat init/install-homebrew.sh "$cache_dir/homebrew/install.sh"
+chmod +x init/rustup-init.sh init/install-uv.sh
+
+>&2 echo '[*] Injecting GitHub Actions runner'
+# See also: <https://github.com/servo/servo/settings/actions/runners/new?arch=x64&os=linux>
+# Runner tarball includes symlinks, which are not supported by exFAT (on macOS at least)
+inject_exfat init/actions-runner-osx-x64.tar.gz "$cache_dir/actions-runner-osx-x64-2.321.0.tar.gz"
+
+>&2 echo '[*] Creating working directory for builds (/Volumes/a/a)'
+mkdir -p a
+
+>&2 echo '[*] Injecting servo repo'
+mkdir -p a/servo
+inject_exfat a/servo "$SERVO_CI_MAIN_REPO_PATH"
+git -C a/servo/servo remote remove origin || :
+git -C a/servo/servo remote add origin https://github.com/servo/servo.git
+
+>&2 echo '[*] Injecting cargo cache'
+inject_exfat . "$SERVO_CI_DOT_CARGO_PATH"
+
+>&2 echo '[*] Injecting cargo config'
+inject_exfat .cargo/config.toml "$script_dir/shared/cargo-config.toml"

macos13/init.sh

@@ -0,0 +1,34 @@
+#!/usr/bin/env zsh
+set -euo pipefail -o bsdecho
+
+# Install Homebrew, including Xcode CLT (Command Line Tools)
+NONINTERACTIVE=1 /Volumes/a/init/install-homebrew.sh
+
+# Install rustup and the latest Rust
+if ! [ -e /Users/servo/.rustup ]; then
+    /Volumes/a/init/rustup-init.sh -y --quiet
+fi
+
+# ~/.cargo/env requires HOME to be set
+export HOME=/Users/servo
+. /Users/servo/.cargo/env
+
+# Install uv and ensure it is on PATH
+if ! [ -e /Users/servo/.local/bin/uv ]; then
+    /Volumes/a/init/install-uv.sh
+fi
+export PATH=$HOME/.local/bin:$PATH
+
+if ! [ -e /Volumes/a/init/built_servo_once_successfully ]; then
+    cd /Volumes/a/a/servo/servo
+    ./mach bootstrap --force
+    # Build the same way as a typical Linux build job, to allow for incremental builds.
+    ./mach build --use-crown --locked --release --features layout_2013
+    touch /Volumes/a/init/built_servo_once_successfully
+    sudo shutdown -h now
+    exit
+fi
+
+if [ -e /Volumes/a/init/runner.sh ]; then
+    . /Volumes/a/init/runner.sh
+fi

mount-runner.sh

@@ -10,12 +10,16 @@ else
 fi
 
 mount=$(mktemp -d)
-if [ -e /dev/zvol/$SERVO_CI_ZFS_PREFIX/$vm-part1 ]; then
+if [ -e /dev/zvol/$SERVO_CI_ZFS_PREFIX/$vm-part2 ]; then
+    mount /dev/zvol/$SERVO_CI_ZFS_PREFIX/$vm-part2 $mount
+elif [ -e /dev/zvol/$SERVO_CI_ZFS_CLONE_PREFIX/$vm-part2 ]; then
+    mount /dev/zvol/$SERVO_CI_ZFS_CLONE_PREFIX/$vm-part2 $mount
+elif [ -e /dev/zvol/$SERVO_CI_ZFS_PREFIX/$vm-part1 ]; then
     mount /dev/zvol/$SERVO_CI_ZFS_PREFIX/$vm-part1 $mount
 elif [ -e /dev/zvol/$SERVO_CI_ZFS_CLONE_PREFIX/$vm-part1 ]; then
     mount /dev/zvol/$SERVO_CI_ZFS_CLONE_PREFIX/$vm-part1 $mount
 else
-    >&2 echo "fatal: failed to find $vm-part1 in /dev/zvol/$SERVO_CI_ZFS_PREFIX or /dev/zvol/$SERVO_CI_ZFS_CLONE_PREFIX"
+    >&2 echo "fatal: failed to find $vm-part2 or $vm-part1 in /dev/zvol/$SERVO_CI_ZFS_PREFIX or /dev/zvol/$SERVO_CI_ZFS_CLONE_PREFIX"
     exit 1
 fi
 cd $mount

static/macos13/org.servo.ci.plist

@@ -19,7 +19,7 @@
             <string>open</string>
             <string>-Wa</string><!-- wait, application -->
             <string>/System/Applications/Utilities/Terminal.app</string>
-            <string>/Volumes/a/init/boot.sh</string>
+            <string>/Volumes/a/init/init.sh</string>
     </array>
 </dict>
 </plist>