GitHub Actions: Bump macos-12 jobs to macos-13

As the macos-12 image will be 'fully unsupported' starting with December 3rd: actions/runner-images#10721
dlang · Nov 13, 2024 · e5b41ed · e5b41ed
1 parent a7c85ec
commit e5b41ed
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 28 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -58,8 +58,9 @@ jobs:
           #   os: macos-13
           #   host_dmd: dmd
           #   coverage: true
-          - job_name: macOS 12 x64, DMD (bootstrap)
-            os: macos-12
+          - job_name: macOS 13 x64, DMD (bootstrap)
+            os: macos-13
+            xcode: '14.3.1' # work around 'ld: multiple errors: symbol count from symbol table and dynamic symbol table differ' with old bootstrap compiler
             # de-facto bootstrap version on OSX
             # See: https://github.com/dlang/dmd/pull/13890
             host_dmd: dmd-2.099.1
@@ -100,12 +101,9 @@ jobs:
         if: runner.os != 'Windows'
         run: ${{ runner.os == 'macOS' && 'ci/cirrusci.sh' || 'sudo -E ci/cirrusci.sh' }}
 
-      # NOTE: Linker ICEs with Xcode 15.0.1 (default version on macos-13)
-      # * https://issues.dlang.org/show_bug.cgi?id=24407
-      # Remove this step if the default gets changed to 15.1 in actions/runner-images.
-      - name: 'macOS 13: Switch to Xcode v15.1'
-        if: matrix.os == 'macos-13'
-        run: sudo xcode-select -switch /Applications/Xcode_15.1.app
+      - name: 'macOS: Switch Xcode version if required'
+        if: runner.os == 'macOS' && matrix.xcode
+        run: sudo xcode-select -switch /Applications/Xcode_${{ matrix.xcode }}.app
 
       - name: 'Posix: Install host compiler'
         if: runner.os != 'Windows'

diff --git a/.github/workflows/runnable_cxx.yml b/.github/workflows/runnable_cxx.yml
@@ -57,10 +57,10 @@ jobs:
       # very few PRs actually benefit from this.
       fail-fast: false
       matrix:
-        os: [ macOS-12, ubuntu-20.04, windows-2019 ]
+        os: [ macos-13, ubuntu-20.04, windows-2019 ]
 
         target: [
-          # Versions of clang earlier than 11 are not available on 20.04, but are on macOS-12
+          # Versions of clang earlier than 11 are not available on 20.04, but are on macOS 13
           clang-13.0.0, clang-12.0.0, clang-11.0.0, clang-10.0.0, clang-9.0.0, clang-8.0.0,
         # For g++, we test the oldest compiler on Ubuntu 20.04, which is GCC-9
           g++-11, g++-10, g++-9,
@@ -81,13 +81,13 @@ jobs:
           - { os: ubuntu-20.04, target: msvc-2015 }
           - { os: ubuntu-20.04, target: msvc-2013 }
           # OSX only supports clang
-          - { os: macOS-12, target: g++-11 }
-          - { os: macOS-12, target: g++-10 }
-          - { os: macOS-12, target: g++-9 }
-          - { os: macOS-12, target: msvc-2019 }
-          - { os: macOS-12, target: msvc-2017 }
-          - { os: macOS-12, target: msvc-2015 }
-          - { os: macOS-12, target: msvc-2013 }
+          - { os: macos-13, target: g++-11 }
+          - { os: macos-13, target: g++-10 }
+          - { os: macos-13, target: g++-9 }
+          - { os: macos-13, target: msvc-2019 }
+          - { os: macos-13, target: msvc-2017 }
+          - { os: macos-13, target: msvc-2015 }
+          - { os: macos-13, target: msvc-2013 }
           # We don't test g++ on Windows as DMD only mangles for MSVC
           - { os: windows-2019, target: g++-11 }
           - { os: windows-2019, target: g++-10 }
@@ -126,13 +126,13 @@ jobs:
           - { target: g++-9, compiler: g++, cxx-version: 9.4.0, major: 9 }
           # Platform boilerplate
           - { os: ubuntu-20.04, arch: x86_64-linux-gnu-ubuntu-20.04 }
-          - { os: macOS-12,  arch: x86_64-apple-darwin }
+          - { os: macos-13,  arch: x86_64-apple-darwin }
           # Clang 9.0.0 have a different arch for OSX
-          - { os: macOS-12, target: clang-9.0.0, arch: x86_64-darwin-apple }
+          - { os: macos-13, target: clang-9.0.0, arch: x86_64-darwin-apple }
           # Those targets will generate artifacts that can be used by other testers
           - { storeArtifacts: false }
           - { os: ubuntu-20.04, target: g++-9,    storeArtifacts: true }
-          - { os: macOS-12,  target: clang-9.0.0, storeArtifacts: true }
+          - { os: macos-13,  target: clang-9.0.0, storeArtifacts: true }
           #- { os: windows-2019, target: msvc-2019,   storeArtifacts: true }
 
     # We're using the latest available images at the time of this commit.
@@ -209,7 +209,7 @@ jobs:
         # On OSX, the system header are installed via `xcode-select` and not distributed with clang
         # Since some part of the testsuite rely on CC and CXX being only a binary (not a command),
         # and config files where only introduced from 6.0.0, use a wrapper script.
-        if [ "${{ matrix.os }}" == "macOS-12" ]; then
+        if [ "${{ matrix.os }}" == "macos-13" ]; then
           # Note: heredoc shouldn't be indented
           cat << 'EOF' > ${TMP_CC}-wrapper
         #!/bin/bash
@@ -227,11 +227,15 @@ jobs:
           chmod +x ${TMP_CC}-wrapper ${TMP_CC}++-wrapper
         fi
 
+    - name: 'macOS 13: Switch to Xcode v14.3.1' # to work around '-macosx_version_min has been renamed to -macos_version_min' with some clang versions
+      if: matrix.os == 'macos-13'
+      run: sudo xcode-select -switch /Applications/Xcode_14.3.1.app
+
     - name: '[Posix] Setup environment variables'
       if: matrix.compiler == 'clang' && runner.os != 'Windows'
       run: |
         TMP_CC='${{ github.workspace }}/clang+llvm-${{ matrix.cxx-version }}-${{ matrix.arch }}/bin/clang'
-        if [ "${{ matrix.os }}" == "macOS-12" ]; then
+        if [ "${{ matrix.os }}" == "macos-13" ]; then
           echo "CC=${TMP_CC}-wrapper" >> $GITHUB_ENV
           echo "CXX=${TMP_CC}++-wrapper" >> $GITHUB_ENV
           echo "SDKROOT=$(xcrun --show-sdk-path)" >> $GITHUB_ENV

diff --git a/ci/README.md b/ci/README.md
@@ -112,12 +112,12 @@ The auto tester tests DMD on various Posix platforms.
 **Config**: [azure-pipelines.yml](https://github.com/dlang/dmd/blob/master/.github/workflows/runnable_cxx.yml)
 
 **Checks**:
-- C++ interop tests / Run (macOS-12, clang-13.0.0)
-- C++ interop tests / Run (macOS-12, clang-12.0.0)
-- C++ interop tests / Run (macOS-12, clang-11.0.0)
-- C++ interop tests / Run (macOS-12, clang-10.0.0)
-- C++ interop tests / Run (macOS-12, clang-9.0.0)
-- C++ interop tests / Run (macOS-12, clang-8.0.0)
+- C++ interop tests / Run (macos-13, clang-13.0.0)
+- C++ interop tests / Run (macos-13, clang-12.0.0)
+- C++ interop tests / Run (macos-13, clang-11.0.0)
+- C++ interop tests / Run (macos-13, clang-10.0.0)
+- C++ interop tests / Run (macos-13, clang-9.0.0)
+- C++ interop tests / Run (macos-13, clang-8.0.0)
 - C++ interop tests / Run (ubuntu-20.04, clang-13.0.0)
 - C++ interop tests / Run (ubuntu-20.04, clang-12.0.0)
 - C++ interop tests / Run (ubuntu-20.04, clang-11.0.0)