Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
044c035
Patch Tuesday for September 2025 + macOS 15.6.1
BillyONeal Sep 11, 2025
7f66120
Passing, remove from fail lists.
BillyONeal Sep 15, 2025
ddb2e31
[clockutils] Disable -Werror
BillyONeal Sep 15, 2025
6e6951d
[cpprealm] Add missing header and disable -Werror.
BillyONeal Sep 16, 2025
24edd70
[cpprealm] Also fix macos overzealous template
BillyONeal Sep 16, 2025
8183ef8
[dbow3] Add missing header.
BillyONeal Sep 16, 2025
de0efe8
[awlib] Fix build again.
BillyONeal Sep 16, 2025
926dba6
[hareflow] Add missing header
BillyONeal Sep 16, 2025
7559f2a
[libgo] Add <stdexcept>
BillyONeal Sep 16, 2025
abb516e
[licensepp] Add stdint.h and remove -Werror
BillyONeal Sep 17, 2025
acc5347
[libmysql] Add libtirpc-dev apt package.
BillyONeal Sep 17, 2025
4712f74
[clblas] Use all caps for configure_file variables.
BillyONeal Sep 17, 2025
40bff59
[llgl] Add <cstdint> using upstream patch.
BillyONeal Sep 17, 2025
54c8735
[manifold] Disable -Werror
BillyONeal Sep 17, 2025
ebd9b6a
[pistache] Add <cstdint>.
BillyONeal Sep 17, 2025
04aaa8e
[ms-ifc-sdk] Add <cstdint>.
BillyONeal Sep 17, 2025
8d42c41
[realsense2] Add <stdexcept>.
BillyONeal Sep 18, 2025
a0543c1
[qt5-location] Add stdint.h.
BillyONeal Sep 18, 2025
2b38d1c
[openvino] Disable on x64-osx.
BillyONeal Sep 18, 2025
e3999f2
[nmslib] Fix apple clang detection.
BillyONeal Sep 18, 2025
1affff7
[colmap] Apply upstream macOS fixes
BillyONeal Sep 18, 2025
73816c8
[corrade] Add missing headers.
BillyONeal Sep 18, 2025
f3d39c8
[rtmfp-cpp] Add missing <cstdint> with upstream patch.
BillyONeal Sep 18, 2025
f180114
[treehopper] Add missing <cstdint>
BillyONeal Sep 18, 2025
417a035
Merge remote-tracking branch 'origin/master' into patch-tuesday-septe…
BillyONeal Sep 18, 2025
f8eec8d
[orange-math] Workaround no std::fmodf
BillyONeal Sep 18, 2025
5e6141f
[embree3] Fix missing member references using upstream patch.
BillyONeal Sep 18, 2025
934fb3c
[ggml] Baseline due to https://github.com/ggml-org/ggml/issues/1343
BillyONeal Sep 18, 2025
10866e0
[irrlicht] Avoid using a pointer as a 0.
BillyONeal Sep 18, 2025
f0352d1
[rioki-glow] Add <iostream> to use std::cerr.
BillyONeal Sep 18, 2025
354c9a0
[shaderwriter] Fix incorrect ::template followed by no template argum…
BillyONeal Sep 18, 2025
861f02d
[trubobase64] Fix arm64 detection on macOS.
BillyONeal Sep 18, 2025
c945364
[vanillapdf] Disable broken AutoSubscribe type.
BillyONeal Sep 18, 2025
e32df5b
[xeus] Remove broken LTO flags using upstream's commit.
BillyONeal Sep 18, 2025
78a8869
Fix baseline typo.
BillyONeal Sep 18, 2025
7a397e9
[awlib] graphics needs hudf
BillyONeal Sep 18, 2025
b36717d
Feature baseline nitpicks.
BillyONeal Sep 18, 2025
eb283fa
Copy llgl skip from ci.baseline.txt to ci.feature.baseline.txt
BillyONeal Sep 18, 2025
23accda
More feature baseline.
BillyONeal Sep 18, 2025
f7bf74c
More feature baseline
BillyONeal Sep 18, 2025
83d1536
[qt5-location] Actually add the macOS fixing patch 😅
BillyONeal Sep 19, 2025
89dec07
treehopper now passes
BillyONeal Sep 19, 2025
5d5ce74
[cpprealm] Disable -Werror harder
BillyONeal Sep 19, 2025
a0c2c3f
[ggml] Add patch suggested by upstream maintainers for llama.cpp
BillyONeal Sep 20, 2025
4c34d87
Skip libxt again.
BillyONeal Sep 22, 2025
42b79fd
[magnum] Fix missing headers.
BillyONeal Sep 22, 2025
2d8849a
[vcpkg-ci-python] Disable CMP0148 on CMake 4.x
BillyONeal Sep 22, 2025
475d845
More CI feature baseline.
BillyONeal Sep 22, 2025
06e8057
formatting sigh
BillyONeal Sep 22, 2025
84c0218
Complete [libxt]
BillyONeal Sep 23, 2025
fb07f36
Merge remote-tracking branch 'origin/master' into patch-tuesday-septe…
BillyONeal Sep 23, 2025
f0d1218
Merge remote-tracking branch 'origin/master' into patch-tuesday-septe…
BillyONeal Sep 24, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/azure-pipelines/android/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1.4
# DisableDockerDetector "Used to build the container deployed to Azure Container Registry"
FROM ubuntu:noble-20250714
FROM ubuntu:noble-20250805

ADD https://packages.microsoft.com/config/ubuntu/24.04/packages-microsoft-prod.deb /packages-microsoft-prod.deb
ADD https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14+7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.14_7.tar.gz /OpenJDK17U-jdk_x64_linux_hotspot_17.0.14_7.tar.gz
Expand Down
4 changes: 2 additions & 2 deletions scripts/azure-pipelines/android/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ jobs:
- name: ANDROID_NDK_HOME
value: /android-ndk-r28c
- name: ANDROID_DOCKER_IMAGE
value: 'vcpkgandroidwus.azurecr.io/vcpkg-android:2025-08-12'
value: 'vcpkgandroidwus.azurecr.io/vcpkg-android:2025-09-11'
- name: LINUX_DOCKER_IMAGE
value: 'vcpkgandroidwus.azurecr.io/vcpkg-linux:2025-08-12'
value: 'vcpkgandroidwus.azurecr.io/vcpkg-linux:2025-09-11'
steps:
# Note: /mnt is the Azure machines' temporary disk.
- bash: |
Expand Down
4 changes: 2 additions & 2 deletions scripts/azure-pipelines/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,14 @@ jobs:
- template: osx/azure-pipelines.yml
parameters:
jobName: x64_osx
poolName: 'PrOsx-2025-01-24'
poolName: 'PrOsx-2025-09-11'
vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
tripletPattern: ${{ parameters.tripletPattern }}

- template: osx/azure-pipelines.yml
parameters:
jobName: arm64_osx
poolName: 'PrOsx-2025-01-24-arm64'
poolName: 'PrOsx-2025-09-11-arm64'
vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
tripletPattern: ${{ parameters.tripletPattern }}

Expand Down
2 changes: 1 addition & 1 deletion scripts/azure-pipelines/linux/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1.4
# DisableDockerDetector "Used to build the container deployed to Azure Container Registry"
FROM ubuntu:jammy-20250714
FROM ubuntu:noble-20250805
ADD provision-image.sh /provision-image.sh
RUN apt-get update && \
apt-get install --no-install-recommends -y curl gnupg ca-certificates
Expand Down
2 changes: 1 addition & 1 deletion scripts/azure-pipelines/linux/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: VCPKG_DOWNLOADS
value: /mnt/vcpkg-ci/downloads
- name: LINUX_DOCKER_IMAGE
value: 'vcpkgandroidwus.azurecr.io/vcpkg-linux:2025-08-12'
value: 'vcpkgandroidwus.azurecr.io/vcpkg-linux:2025-09-11'
steps:
# Note: /mnt is the Azure machines' temporary disk.
- bash: |
Expand Down
2 changes: 1 addition & 1 deletion scripts/azure-pipelines/linux/provision-image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export DEBIAN_FRONTEND=noninteractive

# Add apt repos

# Detect Ubuntu VERSION_ID from /etc/os-release (e.g., "20.04") and format to "2004"
# Detect Ubuntu VERSION_ID from /etc/os-release (e.g., "24.04") and format to "2404"
UBUNTU_VERSION_ID=$(. /etc/os-release && echo "$VERSION_ID")
NVIDIA_REPO_VERSION=$(echo "$UBUNTU_VERSION_ID" | sed 's/\.//')

Expand Down
71 changes: 48 additions & 23 deletions scripts/azure-pipelines/osx/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ This is the checklist for what the vcpkg team does when updating the macOS machi
- [ ] A Parallels license for amd64 or [macosvm](https://github.com/s-u/macosvm) allow-listed
by macOS for arm64. Note that the directory 'Parallels' is still used when using `macosvm`
just so that scripts know where to find the VM and friends.
- [ ] An Xcode installer - you can get this from Apple's developer website,
- [ ] An Xcode .xip - you can get this from Apple's developer website,
although you'll need to sign in first: <https://developer.apple.com/downloads>
If you are doing this from a local macos box, you can skip to the "update the macos host" step.
- [ ] An Xcode Command Line Tools installer

### Instructions (AMD64)

Expand All @@ -23,9 +24,9 @@ This is the checklist for what the vcpkg team does when updating the macOS machi
- [ ] Update or install parallels
- [ ] Download the macOS installer from the app store. See https://support.apple.com/en-us/102662
Note: This portion of the instructions is that which breaks most often depending on what Parallels and macOS are doing.
You might need to use `softwareupdate --fetch-full-installer --full-installer-version 15.6` and point Parallels
You might need to use `softwareupdate --fetch-full-installer --full-installer-version 15.6.1` and point Parallels
at that resulting installer in 'Applications' instead.
- [ ] Run parallels, and select that installer you just downloaded. Name the VM "vcpkg-osx-<DATE>-amd64", for example "vcpkg-osx-2025-08-12-amd64".
- [ ] Run parallels, and select that installer you just downloaded. Name the VM "vcpkg-osx-<DATE>", for example "vcpkg-osx-2025-09-11".
- [ ] When creating the VM, customize the hardware to the following:
* 12 processors
* 24000 MB of memory
Expand All @@ -46,33 +47,40 @@ This is the checklist for what the vcpkg team does when updating the macOS machi
- [ ] Set the desktop wallpaper to a fixed color from Settings -> Wallpaper . (This makes the KVM a lot easier to use :) )
- [ ] Disable automatic updates in the VM: Settings -> General -> Automatic Updates -> Disable them all
- [ ] Enable remote login in System Settings -> General -> Sharing -> Remote Login
- [ ] Update the Azure Agent URI in setup-box.sh to the current version. You can find this by going to the agent pool, selecting "New agent", picking macOS, and copying the link. For example https://download.agent.dev.azure.com/agent/4.259.0/vsts-agent-osx-x64-4.259.0.tar.gz
- [ ] Update the Azure Agent URI in setup-box.sh to the current version. You can find this by going to the agent pool, selecting "New agent", picking macOS, and copying the link. For example https://download.agent.dev.azure.com/agent/4.261.0/vsts-agent-osx-x64-4.261.0.tar.gz
- [ ] In the guest, set the vcpkg user to be able to use sudo without a password. From a dev machine:
```sh
scp path/to/Xcode.xip vcpkg@HOSTMACHINE:/Users/vcpkg/Xcode.xip
ssh vcpkg@HOSTMACHINE
rm ~/.ssh/known_hosts
export GUEST_IP=`prlctl list --full | sed -nr 's/^.*running *([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}).*/\1/p'`
export SSH_COOKIE=vcpkg@$GUEST_IP
ssh $SSH_COOKIE # and then enter the password here
scp Xcode.xip $SSH_COOKIE:/Users/vcpkg/Xcode.xip
ssh $SSH_COOKIE # and then enter the password here
printf 'vcpkg\tALL=(ALL)\tNOPASSWD:\tALL\n' | sudo tee -a '/etc/sudoers.d/vcpkg'
sudo chmod 0440 '/etc/sudoers.d/vcpkg'
exit
sudo mdutil -ad
xip --expand Xcode.xip
sudo mv Xcode.app /Applications/Xcode.app
rm Xcode.xip
exit
```
- [ ] Copy setup-guest, setup-box.sh, and the xcode installer renamed to 'clt.dmg' to the host, and run setup-guest.sh. From a developer machine:
- [ ] Open Xcode from Applications in the guest GUI. Accept the EULA.
- [ ] Update the Azure Agent URI in setup-box.sh to the current version. You can find this by going to the agent pool, selecting "New agent", picking macOS, and copying the link. For example https://download.agent.dev.azure.com/agent/4.261.0/vsts-agent-osx-x64-4.261.0.tar.gz
- [ ] Copy setup-box.sh and the xcode installer renamed to 'clt.dmg' to the host. For example from a dev workstation:
```sh
scp ./setup-guest.sh vcpkg@HOSTMACHINE:/Users/vcpkg
scp ./setup-box.sh vcpkg@HOSTMACHINE:/Users/vcpkg
scp path/to/console/tools.dmg vcpkg@HOSTMACHINE:/Users/vcpkg/clt.dmg
ssh vcpkg@HOSTMACHINE
rm ~/.ssh/known_hosts
chmod +x setup-guest.sh
./setup-guest.sh
rm setup-guest.sh
rm setup-box.sh
rm clt.dmg
exit
```
- [ ] Shut down the VM cleanly
- [ ] Shut down the VM cleanly.
- [ ] Ensure that there is no host system specific 'hardware' like macOS install .isos attached.
- [ ] Set the VM 'Isolated'
- [ ] Boot and then cleanly shut down the VM.
Expand All @@ -82,8 +90,8 @@ This is the checklist for what the vcpkg team does when updating the macOS machi
```sh
ssh vcpkg@HOSTMACHINE
brew install azcopy
azcopy copy ~/Parallels/vcpkg-osx-2025-08-12-amd64.pvmp "https://vcpkgimageminting.blob.core.windows.net/pvms?<SAS>"
azcopy copy ~/Parallels/vcpkg-osx-2025-08-12-amd64.sha256.txt "https://vcpkgimageminting.blob.core.windows.net/pvms?<SAS>"
azcopy copy ~/Parallels/vcpkg-osx-2025-09-11.pvmp "https://vcpkgimageminting.blob.core.windows.net/pvms?<SAS>"
azcopy copy ~/Parallels/vcpkg-osx-2025-09-11.sha256.txt "https://vcpkgimageminting.blob.core.windows.net/pvms?<SAS>"
exit
```
- [ ] Go to https://dev.azure.com/vcpkg/public/_settings/agentqueues and create a new self hosted Agent pool named `PrOsx-YYYY-MM-DD` based on the current date. Grant microsoft.vcpkg.ci and microsoft.vcpkg.pr access.
Expand All @@ -104,13 +112,13 @@ This is the checklist for what the vcpkg team does when updating the macOS machi
rm macosvm-0.2-1-arm64-darwin21.tar.gz
exit
```
- [ ] Download the matching `.ipsw` for the macOS copy to install. See https://mrmacintosh.com/apple-silicon-m1-full-macos-restore-ipsw-firmware-files-database/ ; links there to find the .ipsw. Example: https://updates.cdn-apple.com/2025SummerFCS/fullrestores/082-08674/51294E4D-A273-44BE-A280-A69FC347FB87/UniversalMac_15.6_24G84_Restore.ipsw
- [ ] Determine the VM name using the form "vcpkg-osx-<date>-arm64", for example "vcpkg-osx-2025-08-12-arm64".
- [ ] Open a terminal and run the following commands to create the VM with vcpkg-osx-2025-08-12-arm64 and UniversalMac_15.6_24G84_Restore.ipsw replaced as appropriate. This must be run in the KVM as it uses a GUI:
- [ ] Download the matching `.ipsw` for the macOS copy to install. See https://mrmacintosh.com/apple-silicon-m1-full-macos-restore-ipsw-firmware-files-database/ ; links there to find the .ipsw. Example: https://updates.cdn-apple.com/2025SummerFCS/fullrestores/093-10809/CFD6DD38-DAF0-40DA-854F-31AAD1294C6F/UniversalMac_15.6.1_24G90_Restore.ipsw
- [ ] Determine the VM name using the form "vcpkg-osx-<date>-arm64", for example "vcpkg-osx-2025-09-11-arm64".
- [ ] Open a terminal and run the following commands to create the VM with vcpkg-osx-2025-09-11-arm64 and UniversalMac_15.6.1_24G90_Restore.ipsw replaced as appropriate. This must be run in the KVM as it uses a GUI:
```sh
mkdir -p ~/Parallels/vcpkg-osx-2025-08-12-arm64
cd ~/Parallels/vcpkg-osx-2025-08-12-arm64
~/macosvm --disk disk.img,size=500g --aux aux.img -c 8 -r 12g --restore ~/UniversalMac_15.6_24G84_Restore.ipsw ./vm.json
mkdir -p ~/Parallels/vcpkg-osx-2025-09-11-arm64
cd ~/Parallels/vcpkg-osx-2025-09-11-arm64
~/macosvm --disk disk.img,size=500g --aux aux.img -c 8 -r 12g --restore ~/UniversalMac_15.6.1_24G90_Restore.ipsw ./vm.json
~/macosvm -g ./vm.json
```
- [ ] Follow prompts as you would on real hardware.
Expand All @@ -126,16 +134,23 @@ This is the checklist for what the vcpkg team does when updating the macOS machi
- [ ] Set the desktop wallpaper to a fixed color from Settings -> Wallpaper . (This makes the KVM a lot easier to use :) )
- [ ] Disable automatic updates in the VM: Settings -> General -> Automatic Updates -> Disable them all
- [ ] Enable remote login in the VM: Settings -> General -> Sharing -> Remote Login
- [ ] Set the vcpkg user to be able to use sudo without a password. For example from a dev workstation:
- [ ] Set the vcpkg user to be able to use sudo without a password, and install Xcode. For example from a dev workstation:
```sh
scp path/to/Xcode.xip vcpkg@HOSTMACHINE:/Users/vcpkg/Xcode.xip
ssh vcpkg@HOSTMACHINE
rm ~/.ssh/known_hosts
scp Xcode.xip vcpkg@vcpkgs-Virtual-Machine.local:/Users/vcpkg/Xcode.xip
ssh vcpkg@vcpkgs-Virtual-Machine.local
printf 'vcpkg\tALL=(ALL)\tNOPASSWD:\tALL\n' | sudo tee -a '/etc/sudoers.d/vcpkg'
sudo chmod 0440 '/etc/sudoers.d/vcpkg'
sudo mdutil -ad
xip --expand Xcode.xip
sudo mv Xcode.app /Applications/Xcode.app
rm Xcode.xip
exit
```
- [ ] Update the Azure Agent URI in setup-box.sh to the current version. You can find this by going to the agent pool, selecting "New agent", picking macOS, and copying the link. For example https://download.agent.dev.azure.com/agent/4.259.0/vsts-agent-osx-arm64-4.259.0.tar.gz
- [ ] Open Xcode from Applications in the guest GUI. Uncheck the "code completion model" and accept the EULA.
- [ ] Update the Azure Agent URI in setup-box.sh to the current version. You can find this by going to the agent pool, selecting "New agent", picking macOS, and copying the link. For example https://download.agent.dev.azure.com/agent/4.261.0/vsts-agent-osx-arm64-4.261.0.tar.gz
- [ ] Copy setup-box.sh and the xcode installer renamed to 'clt.dmg' to the host. For example from a dev workstation:
```sh
scp ./setup-guest.sh vcpkg@HOSTMACHINE:/Users/vcpkg
Expand Down Expand Up @@ -178,8 +193,8 @@ Run these steps on each machine to add to the fleet. Skip steps that were done i
ssh vcpkg@HOSTMACHINE
brew install azcopy
cd ~/Parallels
azcopy copy "https://vcpkgimageminting.blob.core.windows.net/pvms/vcpkg-osx-<DATE>-amd64.pvmp?<SAS>" .
azcopy copy "https://vcpkgimageminting.blob.core.windows.net/pvms/vcpkg-osx-<DATE>-amd64.sha256.txt?<SAS>" .
azcopy copy "https://vcpkgimageminting.blob.core.windows.net/pvms/vcpkg-osx-<DATE>.pvmp?<SAS>" .
azcopy copy "https://vcpkgimageminting.blob.core.windows.net/pvms/vcpkg-osx-<DATE>.sha256.txt?<SAS>" .
exit
```
- [ ] Open the .pvmp in Parallels, and unpack it.
Expand All @@ -197,7 +212,12 @@ Run these steps on each machine to add to the fleet. Skip steps that were done i
- [ ] [grab a PAT][] if you don't already have one
- [ ] Copy the guest deploy script to the host, and run it with a first parameter of your PAT. From a developer machine:
```sh
./fire-register-guest.ps1 -Target HOSTMACHINE -Pat YourPatGoesHere
scp register-guest.sh vcpkg@HOSTMACHINE:/Users/vcpkg/register-guest.sh
ssh vcpkg@HOSTMACHINE
rm .ssh/known_hosts
chmod +x register-guest.sh
./register-guest.sh PAT GOES HERE
rm register-guest.sh
```
- [ ] In the VM, open a terminal on the host and run:
```
Expand Down Expand Up @@ -243,7 +263,12 @@ Run these steps on each machine to add to the fleet. Skip steps that were done i
- [ ] [grab a PAT][] if you don't already have one
- [ ] Copy the guest deploy script to the host, and run it with a first parameter of your PAT. From a developer machine:
```sh
./fire-register-guest.ps1 -Target HOSTMACHINE -Pat YourPatGoesHere
scp register-guest.sh vcpkg@HOSTMACHINE:/Users/vcpkg/register-guest.sh
ssh vcpkg@HOSTMACHINE
rm .ssh/known_hosts
chmod +x register-guest.sh
./register-guest.sh PAT GOES HERE
rm register-guest.sh
```
- [ ] That will cleanly shut down the VM. In the KVM's terminal, relaunch the VM in ephemeral mode with:
```sh
Expand Down
22 changes: 0 additions & 22 deletions scripts/azure-pipelines/osx/fire-register-guest.ps1
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This kept breaking on me again and I've given up on the single script deploy from dev machine concept :(

This file was deleted.

4 changes: 3 additions & 1 deletion scripts/azure-pipelines/osx/register-guest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,13 @@ export POOL=`echo ~/Parallels/*/ | sed -nr 's/\/Users\/vcpkg\/Parallels\/vcpkg-o
# on arm64, DNS works
export SSH_COOKIE=vcpkg@vcpkgs-Virtual-Machine.local
else
export POOL=`echo ~/Parallels/*.pvm | sed -nr 's/\/Users\/vcpkg\/Parallels\/vcpkg-osx-([0-9]{4}-[0-9]{2}-[0-9]{2})-amd64\.pvm/PrOsx-\1/p'`
export POOL=`echo ~/Parallels/*.pvm | sed -nr 's/\/Users\/vcpkg\/Parallels\/vcpkg-osx-([0-9]{4}-[0-9]{2}-[0-9]{2})\.pvm/PrOsx-\1/p'`
# on amd64, DNS does not work, but luckily for us prlctl does know the IP
export GUEST_IP=`prlctl list --full | sed -nr 's/^.*running *([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}).*/\1/p'`
export SSH_COOKIE=vcpkg@$GUEST_IP
fi
echo "POOL: $POOL"
echo "SSH_COOKIE: $SSH_COOKIE"
ssh $SSH_COOKIE -o "StrictHostKeyChecking=no" -i ~/Parallels/*/id_guest "~/myagent/config.sh --unattended --url https://dev.azure.com/vcpkg --work ~/Data/work --auth pat --token $1 --pool $POOL --agent $AGENT --replace --acceptTeeEula"
if [ `uname -m` = 'arm64' ]; then
ssh $SSH_COOKIE -o "StrictHostKeyChecking=no" -i ~/Parallels/*/id_guest "sudo shutdown -h now"
Expand Down
10 changes: 3 additions & 7 deletions scripts/azure-pipelines/osx/setup-box.sh
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
#!/bin/sh

# The next 2 lines are a workaround for an XCode Command Line Tools bug:
# https://developer.apple.com/documentation/xcode-release-notes/xcode-15-release-notes#Known-Issues
sudo mdutil -ad
sudo mkdir -p /Library/Developer/CommandLineTools
sudo touch /Library/Developer/CommandLineTools/.beta
hdiutil attach clt.dmg -mountpoint /Volumes/setup-installer
sudo installer -pkg "/Volumes/setup-installer/Command Line Tools.pkg" -target /
hdiutil detach /Volumes/setup-installer
rm clt.dmg
sudo xcode-select -s /Applications/Xcode.app
/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
if [ `uname -m` = 'arm64' ]; then
(echo; echo 'eval "$(/opt/homebrew/bin/brew shellenv)"') >> /Users/vcpkg/.zprofile
Expand All @@ -20,9 +16,9 @@ fi
brew install autoconf-archive autoconf automake azcopy azure-cli bison cmake gettext gfortran gnu-sed gperf gtk-doc libtool meson mono nasm ninja pkg-config powershell python-setuptools texinfo yasm
mkdir ~/Data
if [ `uname -m` = 'arm64' ]; then
curl -s -o ~/Downloads/azure-agent.tar.gz https://download.agent.dev.azure.com/agent/4.259.0/vsts-agent-osx-arm64-4.259.0.tar.gz
curl -s -o ~/Downloads/azure-agent.tar.gz https://download.agent.dev.azure.com/agent/4.261.0/vsts-agent-osx-arm64-4.261.0.tar.gz
else
curl -s -o ~/Downloads/azure-agent.tar.gz https://download.agent.dev.azure.com/agent/4.259.0/vsts-agent-osx-x64-4.259.0.tar.gz
curl -s -o ~/Downloads/azure-agent.tar.gz https://download.agent.dev.azure.com/agent/4.261.0/vsts-agent-osx-x64-4.261.0.tar.gz
fi
mkdir ~/myagent
tar xf ~/Downloads/azure-agent.tar.gz -C ~/myagent
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
- job: x64_windows
pool:
name: vcpkg-testing-msvc
demands: ImageVersionOverride -equals 2025.08.15
demands: ImageVersionOverride -equals 2025.09.12
timeoutInMinutes: 2880 # 2 days
variables:
- name: WORKING_ROOT
Expand Down
2 changes: 1 addition & 1 deletion scripts/azure-pipelines/windows/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
condition: and(succeeded(), contains('^${{ replace(parameters.jobName, '_', '-') }}$', '${{ parameters.tripletPattern }}'))
pool:
name: PrWin-WUS
demands: ImageVersionOverride -equals 2025.08.15
demands: ImageVersionOverride -equals 2025.09.12
timeoutInMinutes: 2880 # 2 days
variables:
- name: WORKING_ROOT
Expand Down
4 changes: 2 additions & 2 deletions scripts/azure-pipelines/windows/deploy-azcopy.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ if (Test-Path "$PSScriptRoot/utility-prefix.ps1") {
[string]$AzCopyUrl
if ([string]::IsNullOrEmpty($SasToken)) {
Write-Host 'Downloading from the Internet'
$AzCopyUrl = 'https://github.com/Azure/azure-storage-azcopy/releases/download/v10.30.0/azcopy_windows_amd64_10.30.0.zip'
$AzCopyUrl = 'https://github.com/Azure/azure-storage-azcopy/releases/download/v10.30.1/azcopy_windows_amd64_10.30.1.zip'
} else {
Write-Host 'Downloading from vcpkgimageminting using SAS token'
$SasToken = $SasToken.Replace('"', '')
$AzCopyUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/azcopy_windows_amd64_10.30.0.zip?$SasToken"
$AzCopyUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/azcopy_windows_amd64_10.30.1.zip?$SasToken"
}

mkdir -Force "C:\AzCopy10"
Expand Down
4 changes: 2 additions & 2 deletions scripts/azure-pipelines/windows/deploy-azure-cli.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ if (Test-Path "$PSScriptRoot/utility-prefix.ps1") {
[string]$AzCliUrl
if ([string]::IsNullOrEmpty($SasToken)) {
Write-Host 'Downloading from the Internet'
$AzCliUrl = 'https://azcliprod.blob.core.windows.net/msi/azure-cli-2.76.0-x64.msi'
$AzCliUrl = 'https://azcliprod.blob.core.windows.net/msi/azure-cli-2.77.0-x64.msi'
} else {
Write-Host 'Downloading from vcpkgimageminting using SAS token'
$SasToken = $SasToken.Replace('"', '')
$AzCliUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/azure-cli-2.76.0-x64.msi?$SasToken"
$AzCliUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/azure-cli-2.77.0-x64.msi?$SasToken"
}

DownloadAndInstall -Url $AzCliUrl -Name 'Azure CLI' -Args @('/quiet', '/norestart')
Loading
Loading