diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aee981037..dac58ed7f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -134,7 +134,7 @@ build-android: build-mac: stage: build interruptible: true - image: ghcr.io/cirruslabs/macos-runner:sequoia + image: ghcr.io/cirruslabs/macos-sonoma-xcode:15.3 tags: - tart-installed timeout: 2 hours diff --git a/util/mac-tart-build.sh b/util/mac-tart-build.sh index 0259b0a84..8a2e8e43a 100755 --- a/util/mac-tart-build.sh +++ b/util/mac-tart-build.sh @@ -7,7 +7,7 @@ DIR="$(realpath $SCRIPT_DIR/..)" tart list --format json | jq -r '.[] | select(.State == "running") | .Name' | xargs -L 1 tart stop IMAGE=sonoma-$(date +%s) -tart clone ghcr.io/cirruslabs/macos-runner:sonoma $IMAGE +tart clone ghcr.io/cirruslabs/macos-sonoma-xcode:15.3 $IMAGE bash -c "tart run $IMAGE --no-graphics --dir=streamplace:$DIR --dir=signing:/Volumes/UnlockedKey &" while ! tart ip $IMAGE; do echo 'waiting for ip...' && sleep 1; done; export EXIT="0"