Skip to content

Commit fa4fdb4

Browse files
BillyONealtalregev
authored andcommitted
Patch Tuesday for July 2025 (microsoft#46371)
1 parent 8b86e9a commit fa4fdb4

26 files changed

+146
-127
lines changed

ports/osgearth/vcpkg.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"name": "osgearth",
33
"version": "3.7.2",
4-
"port-version": 2,
4+
"port-version": 3,
55
"description": "osgEarth - 3D Maps for OpenSceneGraph / C++14",
66
"homepage": "https://github.com/gwaldron/osgearth",
77
"license": "LGPL-3.0-or-later",
8-
"supports": "!(arm32 | x86 | wasm32 | xbox)",
8+
"supports": "!(arm32 | x86 | wasm32 | xbox) & !(windows & arm64)",
99
"dependencies": [
1010
"blend2d",
1111
"draco",

scripts/azure-pipelines/android/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1.4
22
# DisableDockerDetector "Used to build the container deployed to Azure Container Registry"
3-
FROM ubuntu:noble-20250529
3+
FROM ubuntu:noble-20250619
44

55
ADD https://packages.microsoft.com/config/ubuntu/24.04/packages-microsoft-prod.deb /packages-microsoft-prod.deb
66
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
@@ -42,7 +42,7 @@ ENV APT_PACKAGES="$APT_PACKAGES libxext-dev libxfixes-dev libxrender-dev \
4242
libxcb-cursor-dev libxkbcommon-x11-dev"
4343

4444
## PowerShell
45-
ENV APT_PACKAGES="$APT_PACKAGES powershell"
45+
ENV APT_PACKAGES="$APT_PACKAGES powershell azcopy"
4646

4747
# The BUILD_DATE argument forces cache invalidation so we get updated apt dependencies
4848
ARG BUILD_DATE

scripts/azure-pipelines/android/azure-pipelines.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- job: ${{ parameters.jobName }}
1919
condition: and(succeeded(), contains('^${{ replace(parameters.jobName, '_', '-') }}$', '${{ parameters.tripletPattern }}'))
2020
pool:
21-
name: PrAnd-WUS
21+
name: PrAzureLinux3Docker
2222
timeoutInMinutes: 1440 # 1 day
2323
variables:
2424
- name: WORKING_ROOT
@@ -28,9 +28,9 @@ jobs:
2828
- name: ANDROID_NDK_HOME
2929
value: /android-ndk-r27c
3030
- name: ANDROID_DOCKER_IMAGE
31-
value: 'vcpkgandroidwus.azurecr.io/vcpkg-android:2025-06-11'
31+
value: 'vcpkgandroidwus.azurecr.io/vcpkg-android:2025-07-10'
3232
- name: LINUX_DOCKER_IMAGE
33-
value: 'vcpkgandroidwus.azurecr.io/vcpkg-linux:2025-06-11'
33+
value: 'vcpkgandroidwus.azurecr.io/vcpkg-linux:2025-07-10'
3434
steps:
3535
# Note: /mnt is the Azure machines' temporary disk.
3636
- bash: |

scripts/azure-pipelines/linux/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1.4
22
# DisableDockerDetector "Used to build the container deployed to Azure Container Registry"
3-
FROM ubuntu:jammy-20250530
3+
FROM ubuntu:jammy-20250619
44
ADD provision-image.sh /provision-image.sh
55
RUN apt-get update && \
66
apt-get install --no-install-recommends -y curl gnupg ca-certificates

scripts/azure-pipelines/linux/azure-pipelines.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ jobs:
1919
- job: ${{ parameters.jobName }}
2020
condition: and(succeeded(), contains('^${{ replace(parameters.jobName, '_', '-') }}$', '${{ parameters.tripletPattern }}'))
2121
pool:
22-
name: PrAnd-WUS # The "android" pool name is something of a misnomer; the pool is named that way due to Android being our first dockerized platform
22+
name: PrAzureLinux3Docker
2323
timeoutInMinutes: 1440 # 1 day
2424
variables:
2525
- name: WORKING_ROOT
2626
value: /mnt/vcpkg-ci
2727
- name: VCPKG_DOWNLOADS
2828
value: /mnt/vcpkg-ci/downloads
2929
- name: LINUX_DOCKER_IMAGE
30-
value: 'vcpkgandroidwus.azurecr.io/vcpkg-linux:2025-06-11'
30+
value: 'vcpkgandroidwus.azurecr.io/vcpkg-linux:2025-07-10'
3131
steps:
3232
# Note: /mnt is the Azure machines' temporary disk.
3333
- bash: |

scripts/azure-pipelines/linux/provision-image.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ APT_PACKAGES="$APT_PACKAGES cuda-compiler-12-8 cuda-libraries-dev-12-8 cuda-driv
150150
libnccl2 libnccl-dev"
151151

152152
## PowerShell + Azure
153-
APT_PACKAGES="$APT_PACKAGES powershell azure-cli"
153+
APT_PACKAGES="$APT_PACKAGES powershell azcopy azure-cli"
154154

155155
## Additionally required/installed by Azure DevOps Scale Set Agents, skip on WSL
156156
if [[ $(grep microsoft /proc/version) ]]; then

scripts/azure-pipelines/osx/README.md

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -181,13 +181,7 @@ Run these steps on each machine to add to the fleet. Skip steps that were done i
181181
- [ ] [grab a PAT][] if you don't already have one
182182
- [ ] Copy the guest deploy script to the host, and run it with a first parameter of your PAT. From a developer machine:
183183
```sh
184-
scp ./register-guest.sh vcpkg@HOSTMACHINE:/Users/vcpkg
185-
ssh vcpkg@HOSTMACHINE
186-
rm .ssh/known_hosts
187-
chmod +x register-guest.sh
188-
./register-guest.sh <PAT>
189-
rm register-guest.sh
190-
exit
184+
./fire-register-guest.ps1 -Target HOSTMACHINE -Pat YourPatGoesHere
191185
```
192186
- [ ] In the VM, open a terminal on the host and run:
193187
```
@@ -233,13 +227,7 @@ Run these steps on each machine to add to the fleet. Skip steps that were done i
233227
- [ ] [grab a PAT][] if you don't already have one
234228
- [ ] Copy the guest deploy script to the host, and run it with a first parameter of your PAT. From a developer machine:
235229
```sh
236-
scp ./register-guest.sh vcpkg@HOSTMACHINE:/Users/vcpkg
237-
ssh vcpkg@HOSTMACHINE
238-
rm .ssh/known_hosts
239-
chmod +x register-guest.sh
240-
./register-guest.sh <PAT>
241-
rm register-guest.sh
242-
exit
230+
./fire-register-guest.ps1 -Target HOSTMACHINE -Pat YourPatGoesHere
243231
```
244232
- [ ] In the KVM's terminal, relaunch the VM in ephemeral mode with:
245233
```sh
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
Param(
2+
[Parameter(Mandatory = $true)]
3+
[ValidateNotNullOrEmpty()]
4+
[string]$Pat,
5+
[Parameter(Mandatory = $true)]
6+
[ValidateNotNullOrEmpty()]
7+
[string]$Target
8+
)
9+
10+
$sshCookie = "vcpkg@$Target"
11+
scp "$PSScriptRoot/register-guest.sh" "$($sshCookie):/Users/vcpkg/register-guest.sh"
12+
13+
$script = @"
14+
rm .ssh/known_hosts
15+
chmod +x /Users/vcpkg/register-guest.sh
16+
/Users/vcpkg/register-guest.sh $Pat
17+
rm /Users/vcpkg/register-guest.sh
18+
"@
19+
20+
$script | ssh $sshCookie

scripts/azure-pipelines/osx/register-guest.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ if [ -z "$1" ]; then
44
exit 1
55
fi
66
export AGENT=`hostname | sed -nr 's/([^.]+).*/\1/p'`
7+
echo "THIS IS AGENT: $AGENT"
78
if [ `uname -m` = 'arm64' ]; then
89
export POOL=`echo ~/Parallels/* | sed -nr 's/\/Users\/vcpkg\/Parallels\/vcpkg-osx-([0-9]{4}-[0-9]{2}-[0-9]{2})-arm64/PrOsx-\1-arm64/p'`
910
# on arm64, DNS works
@@ -14,7 +15,4 @@ export POOL=`echo ~/Parallels/*.pvm | sed -nr 's/\/Users\/vcpkg\/Parallels\/vcpk
1415
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'`
1516
export SSH_COOKIE=vcpkg@$GUEST_IP
1617
fi
17-
ssh $SSH_COOKIE -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"
18-
if [ `uname -m` = 'arm64' ]; then
19-
ssh $SSH_COOKIE -i ~/Parallels/*/id_guest "sudo shutdown -h now"
20-
fi
18+
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"

scripts/azure-pipelines/osx/setup-box.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ else
1616
(echo; echo 'eval "$(/usr/local/bin/brew shellenv)"') >> /Users/vcpkg/.zprofile
1717
eval "$(/usr/local/bin/brew shellenv)"
1818
fi
19-
brew install autoconf-archive autoconf automake azure-cli bison cmake gettext gfortran gnu-sed gperf gtk-doc libtool meson mono nasm ninja pkg-config powershell python-setuptools texinfo yasm
19+
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
2020
mkdir ~/Data
2121
if [ `uname -m` = 'arm64' ]; then
2222
curl -s -o ~/Downloads/azure-agent.tar.gz https://vstsagentpackage.azureedge.net/agent/4.248.0/vsts-agent-osx-arm64-4.248.0.tar.gz

0 commit comments

Comments
 (0)