Skip to content

Commit af7fe0c

Browse files
committed
scalar-functional-tests: upgrade to a newer macOS pool
The macos-13 runner pool will soon be closing down, as per https://github.blog/changelog/2025-09-19-github-actions-macos-13-runner-image-is-closing-down/ Unlike the Git project in 73b9cdb (GitHub CI: macos-13 images are no more, 2025-11-04), let's not upgrade to the next-newer pool timidly, but boldly go to the latest pool, macos-15. Note: That pool has ARM-based machines, and hence the installation path of Git must be adjusted: it is now /opt/homebrew instead of /usr/local. Likewise, the no-longer-supported .NET 3.1 used in `microsoft/scalar` does not support ARM64, therefore we have to upgrade to a newer, still-supported .NET version (which is A Good Idea, anyway). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
1 parent 9c6b4d2 commit af7fe0c

File tree

1 file changed

+17
-4
lines changed

1 file changed

+17
-4
lines changed

.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)