Skip to content

Commit 1467580

Browse files
authored
ci: use a newer macOS pool (#828)
The macos-13 pool is no longer available, as of December 2nd, 2025. This PR contains backports of the fixes that already made it to the `vfs-2.52.0` branch.
2 parents c926252 + 4165d4a commit 1467580

2 files changed

Lines changed: 21 additions & 8 deletions

File tree

.github/workflows/main.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -316,16 +316,16 @@ jobs:
316316
vector:
317317
- jobname: osx-clang
318318
cc: clang
319-
pool: macos-13
319+
pool: macos-14
320320
- jobname: osx-reftable
321321
cc: clang
322-
pool: macos-13
322+
pool: macos-14
323323
- jobname: osx-gcc
324324
cc: gcc-13
325-
pool: macos-13
325+
pool: macos-14
326326
- jobname: osx-meson
327327
cc: clang
328-
pool: macos-13
328+
pool: macos-14
329329
env:
330330
CC: ${{matrix.vector.cc}}
331331
CC_PACKAGE: ${{matrix.vector.cc_package}}

.github/workflows/scalar-functional-tests.yml

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
fail-fast: false
2121
matrix:
2222
# Order by runtime (in descending order)
23-
os: [windows-2022, macos-13, ubuntu-22.04]
23+
os: [windows-2022, macos-15, ubuntu-22.04]
2424
# Scalar.NET used to be tested using `features: [false, experimental]`
2525
# But currently, Scalar/C ignores `feature.scalar` altogether, so let's
2626
# save some electrons and run only one of them...
@@ -99,7 +99,7 @@ jobs:
9999
;;
100100
macOS)
101101
SUDO=sudo
102-
extra=prefix=/usr/local
102+
extra=prefix=/opt/homebrew
103103
;;
104104
esac
105105
@@ -123,10 +123,23 @@ jobs:
123123
repository: ${{ env.SCALAR_REPOSITORY }}
124124
ref: ${{ env.SCALAR_REF }}
125125

126-
- name: Setup .NET Core
126+
- name: Target .NET 9
127+
shell: bash
128+
run:
129+
csproj=scalar/Scalar.FunctionalTests/Scalar.FunctionalTests.csproj &&
130+
sed 's/netcoreapp3\.1/net9.0/g' <$csproj >$csproj.new &&
131+
mv $csproj.new $csproj &&
132+
133+
echo "BUILD_FRAGMENT=bin/Release/net9.0" >>$GITHUB_ENV &&
134+
135+
props=scalar/Directory.Build.props &&
136+
sed 's/\(<RuntimeIdentifiers>\)[^<]*/\1osx-arm64/' <$props >$props.new &&
137+
mv $props.new $props
138+
139+
- name: Setup .NET
127140
uses: actions/setup-dotnet@v4
128141
with:
129-
dotnet-version: '3.1.426'
142+
dotnet-version: '9.0.306'
130143

131144
- name: Install dependencies
132145
run: dotnet restore

0 commit comments

Comments
 (0)