From 73b9cdb7c40a675a95758d678c5c7509f98172c8 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 4 Nov 2025 15:13:20 -0800 Subject: [PATCH 1/2] GitHub CI: macos-13 images are no more As this image was deprecated on Sep 22nd, and will be dropped on Dec 4th, replace these jobs to use macos-14 images instead. Signed-off-by: Junio C Hamano --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index aa6bce673b4e99..f2af90ad311f6c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -313,16 +313,16 @@ jobs: vector: - jobname: osx-clang cc: clang - pool: macos-13 + pool: macos-14 - jobname: osx-reftable cc: clang - pool: macos-13 + pool: macos-14 - jobname: osx-gcc cc: gcc-13 - pool: macos-13 + pool: macos-14 - jobname: osx-meson cc: clang - pool: macos-13 + pool: macos-14 env: CC: ${{matrix.vector.cc}} CC_PACKAGE: ${{matrix.vector.cc_package}} From 4165d4a09f660ed26f6b310b74d076a41039a22f Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Mon, 10 Nov 2025 19:57:22 +0100 Subject: [PATCH 2/2] 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 73b9cdb7c40 (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 --- .github/workflows/scalar-functional-tests.yml | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/.github/workflows/scalar-functional-tests.yml b/.github/workflows/scalar-functional-tests.yml index 9dd8b241e515c6..fd7eac63092c08 100644 --- a/.github/workflows/scalar-functional-tests.yml +++ b/.github/workflows/scalar-functional-tests.yml @@ -20,7 +20,7 @@ jobs: fail-fast: false matrix: # Order by runtime (in descending order) - os: [windows-2022, macos-13, ubuntu-22.04] + os: [windows-2022, macos-15, ubuntu-22.04] # Scalar.NET used to be tested using `features: [false, experimental]` # But currently, Scalar/C ignores `feature.scalar` altogether, so let's # save some electrons and run only one of them... @@ -99,7 +99,7 @@ jobs: ;; macOS) SUDO=sudo - extra=prefix=/usr/local + extra=prefix=/opt/homebrew ;; esac @@ -123,10 +123,23 @@ jobs: repository: ${{ env.SCALAR_REPOSITORY }} ref: ${{ env.SCALAR_REF }} - - name: Setup .NET Core + - name: Target .NET 9 + shell: bash + run: + csproj=scalar/Scalar.FunctionalTests/Scalar.FunctionalTests.csproj && + sed 's/netcoreapp3\.1/net9.0/g' <$csproj >$csproj.new && + mv $csproj.new $csproj && + + echo "BUILD_FRAGMENT=bin/Release/net9.0" >>$GITHUB_ENV && + + props=scalar/Directory.Build.props && + sed 's/\(\)[^<]*/\1osx-arm64/' <$props >$props.new && + mv $props.new $props + + - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: '3.1.426' + dotnet-version: '9.0.306' - name: Install dependencies run: dotnet restore