Skip to content

Commit d84fb80

Browse files
authored
Update scripts SHA 2025-12-03 and update github actions runners. (#1873)
- Update the scripts SHA to that for 2025-12-03 - That broke several tests due to the change in Ninja version - In order to fix that I updated the tests to ensure we were not triggering cross compilation unless we were actually intending to do that; for example we were selecting x64-osx even though arm64-osx is the 'normal' osx now. - That change in expected triplet itself broke a lot of tests resulting in most of the edits here. - Updating macOS and Ubuntu runners to 26/24.04 the stock GitHub Actions runners don't include a mono installation for the NuGet tests, so getting that on the boxes before running the e2e tests is done here. In general the most impactful change is that we usually need to make a triplet with our expected changes on the fly rather than trying to make checked in test triplets. In particular detecting whether we are on arm64 is difficult because `CMAKE_HOST_SYSTEM_PROCESSOR` is not set before `project()` (as is normally the case in a triplet)
1 parent 3536bb0 commit d84fb80

File tree

43 files changed

+163
-180
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+163
-180
lines changed

.github/workflows/build.yaml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ jobs:
1212
fail-fast: false
1313
matrix:
1414
include:
15-
- os: windows-2022
15+
- os: windows-2025
1616
preset: windows-ci
17-
- os: ubuntu-22.04
17+
- os: ubuntu-24.04
1818
preset: linux-ci
1919
- os: ubuntu-24.04-arm
2020
preset: linux-arm64-ci
21-
- os: macos-14
21+
- os: macos-26
2222
preset: macos-ci
2323
runs-on: ${{ matrix.os }}
2424
timeout-minutes: 120
@@ -70,11 +70,15 @@ jobs:
7070
path: ${{ github.workspace }}/vcpkg-root
7171
repository: microsoft/vcpkg
7272
ref: ${{ steps.vcpkg_sha.outputs.VCPKG_SHA }}
73-
- name: Install Mono (for NuGet export)
74-
if: matrix.preset == 'linux-arm64-ci'
73+
- name: Install Mono (Linux) (for NuGet export)
74+
if: matrix.preset == 'linux-ci' || matrix.preset == 'linux-arm64-ci'
7575
run: |
7676
sudo apt update
7777
sudo apt install -y mono-complete
78+
- name: Install Mono (macOS) (for NuGet export)
79+
if: matrix.preset == 'macos-ci'
80+
run: |
81+
brew install mono
7882
- name: Run vcpkg end-to-end tests
7983
shell: pwsh
8084
run: |

.github/workflows/pr.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
uses: ./.github/workflows/build.yaml
1616

1717
format:
18-
runs-on: windows-2022
18+
runs-on: windows-2025
1919
timeout-minutes: 60
2020
steps:
2121
- uses: actions/checkout@v4
@@ -72,7 +72,7 @@ jobs:
7272
path: out/format.patch
7373

7474
json-schema:
75-
runs-on: windows-2022
75+
runs-on: windows-2025
7676
timeout-minutes: 10
7777
steps:
7878
- uses: actions/checkout@v4
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
skipped-depends:arm64-osx=skip
22
skipped-depends:x64-linux=skip
3-
skipped-depends:x64-osx=skip
3+
skipped-depends:arm64-linux=skip
44
skipped-depends:x64-windows=skip
55
skipped-depends:x86-windows=skip

azure-pipelines/e2e-assets/ci-skipped-ports/baseline.fail.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ always-skip:cross=fail
33
always-skip:arm64-linux=fail
44
always-skip:arm64-osx=fail
55
always-skip:x64-linux=fail
6-
always-skip:x64-osx=fail
76
always-skip:x64-windows=fail
87
always-skip:x86-windows=fail
98

@@ -12,6 +11,5 @@ always-skip:x86-windows=fail
1211
maybe-skip:arm64-linux=fail
1312
maybe-skip:arm64-osx=fail
1413
maybe-skip:x64-linux=fail
15-
maybe-skip:x64-osx=fail
1614
maybe-skip:x64-windows=fail
1715
maybe-skip:x86-windows=fail
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# actual test
22
always-skip:arm64-osx=skip
33
always-skip:x64-linux=skip
4-
always-skip:x64-osx=skip
4+
always-skip:arm64-linux=skip
55
always-skip:x64-windows=skip
66
always-skip:x86-windows=skip
77

88
# don't build cached artifact
99
maybe-transitive-cascade:arm64-osx=skip
1010
maybe-transitive-cascade:x64-linux=skip
11-
maybe-transitive-cascade:x64-osx=skip
11+
maybe-transitive-cascade:arm64-linux=skip
1212
maybe-transitive-cascade:x64-windows=skip
1313
maybe-transitive-cascade:x86-windows=skip

azure-pipelines/e2e-assets/ci/ci.baseline.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
not-sup-host-b:arm64-osx=fail
2-
not-sup-host-b:x64-osx=fail
32
not-sup-host-b:x86-windows=fail
43
not-sup-host-b:x64-windows=fail
54
not-sup-host-b:arm64-windows=fail
@@ -8,7 +7,6 @@ not-sup-host-b:arm64-linux=fail
87

98

109
dep-on-feature-not-sup:arm64-osx=fail
11-
dep-on-feature-not-sup:x64-osx=fail
1210
dep-on-feature-not-sup:x86-windows=fail
1311
dep-on-feature-not-sup:x64-windows=fail
1412
dep-on-feature-not-sup:arm64-windows=fail

azure-pipelines/e2e-assets/ci/ci.pass.baseline.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
not-sup-host-b:arm64-osx=pass
2-
not-sup-host-b:x64-osx=pass
32
not-sup-host-b:x86-windows=pass
43
not-sup-host-b:x64-windows=pass
54
not-sup-host-b:arm64-windows=pass
@@ -8,7 +7,6 @@ not-sup-host-b:arm64-linux=pass
87

98

109
dep-on-feature-not-sup:arm64-osx=pass
11-
dep-on-feature-not-sup:x64-osx=pass
1210
dep-on-feature-not-sup:x86-windows=pass
1311
dep-on-feature-not-sup:x64-windows=pass
1412
dep-on-feature-not-sup:arm64-windows=pass

azure-pipelines/e2e-assets/format-feature-baseline/ci.baseline.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
not-sup-host-b:arm64-osx=fail
2-
not-sup-host-b:x64-osx=fail
32
not-sup-host-b:x86-windows=fail
43
not-sup-host-b:x64-windows=fail
54
not-sup-host-b:arm64-windows=fail
@@ -8,7 +7,6 @@ not-sup-host-b:arm64-linux=fail
87

98

109
dep-on-feature-not-sup:arm64-osx=fail
11-
dep-on-feature-not-sup:x64-osx=fail
1210
dep-on-feature-not-sup:x86-windows=fail
1311
dep-on-feature-not-sup:x64-windows=fail
1412
dep-on-feature-not-sup:arm64-windows=fail

azure-pipelines/e2e-assets/format-feature-baseline/expected/ci.baseline.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ not-sup-host-b:arm64-linux=fail
22
not-sup-host-b:arm64-osx=fail
33
not-sup-host-b:arm64-windows=fail
44
not-sup-host-b:x64-linux=fail
5-
not-sup-host-b:x64-osx=fail
65
not-sup-host-b:x64-windows=fail
76
not-sup-host-b:x86-windows=fail
87

@@ -11,6 +10,5 @@ dep-on-feature-not-sup:arm64-linux=fail
1110
dep-on-feature-not-sup:arm64-osx=fail
1211
dep-on-feature-not-sup:arm64-windows=fail
1312
dep-on-feature-not-sup:x64-linux=fail
14-
dep-on-feature-not-sup:x64-osx=fail
1513
dep-on-feature-not-sup:x64-windows=fail
1614
dep-on-feature-not-sup:x86-windows=fail

azure-pipelines/e2e-assets/format-feature-baseline/expected/prefix-feature-blocks.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ cmake:arm64-osx=pass
22
cmake:arm64-windows-static-md=pass
33
cmake:arm64-windows=pass
44
cmake:x64-linux=pass
5-
cmake:x64-osx=pass
65
cmake:x64-windows-release=pass
76
cmake:x64-windows-static-md=pass
87
cmake:x64-windows-static=pass
@@ -13,7 +12,6 @@ cmake-user:arm64-uwp=pass
1312
cmake-user:arm64-windows-static-md=pass
1413
cmake-user:arm64-windows=pass
1514
cmake-user:x64-linux=pass
16-
cmake-user:x64-osx=pass
1715
cmake-user:x64-windows-release=pass
1816
cmake-user:x64-windows-static-md=pass
1917
cmake-user:x64-windows-static=pass

0 commit comments

Comments
 (0)