mirrors/dmd
1
0
Fork 0
mirror of https://github.com/dlang/dmd.git synced 2025-04-26 05:00:16 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

GitHub Actions: Bump macos-12 jobs to macos-13 (#17063)

Browse source 
As the macos-12 image will be 'fully unsupported' starting with December 3rd:
https://github.com/actions/runner-images/issues/10721
This commit is contained in:
Martin Kinkelin 2024-11-14 03:46:12 +01:00 • committed by GitHub
parent a7c85ec3be
commit 3aaf7bf222
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 30 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

14
.github/workflows/main.yml vendored
View file

@ -58,8 +58,9 @@ jobs:
# os: macos-13 # os: macos-13
# host_dmd: dmd # host_dmd: dmd
# coverage: true # coverage: true
- job_name: macOS 12 x64, DMD (bootstrap) - job_name: macOS 13 x64, DMD (bootstrap)
os: macos-12 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 # de-facto bootstrap version on OSX
# See: https://github.com/dlang/dmd/pull/13890 # See: https://github.com/dlang/dmd/pull/13890
host_dmd: dmd-2.099.1 host_dmd: dmd-2.099.1
@ -100,12 +101,9 @@ jobs:
if: runner.os != 'Windows' if: runner.os != 'Windows'
run: ${{ runner.os == 'macOS' && 'ci/cirrusci.sh' || 'sudo -E ci/cirrusci.sh' }} 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) - name: 'macOS: Switch Xcode version if required'
# * https://issues.dlang.org/show_bug.cgi?id=24407 if: runner.os == 'macOS' && matrix.xcode
# Remove this step if the default gets changed to 15.1 in actions/runner-images. run: sudo xcode-select -switch /Applications/Xcode_${{ matrix.xcode }}.app
- name: 'macOS 13: Switch to Xcode v15.1'
if: matrix.os == 'macos-13'
run: sudo xcode-select -switch /Applications/Xcode_15.1.app
- name: 'Posix: Install host compiler' - name: 'Posix: Install host compiler'
if: runner.os != 'Windows' if: runner.os != 'Windows'

32
.github/workflows/runnable_cxx.yml vendored
View file

@ -57,10 +57,10 @@ jobs:
# very few PRs actually benefit from this. # very few PRs actually benefit from this.
fail-fast: false fail-fast: false
matrix: matrix:
os: [ macOS-12, ubuntu-20.04, windows-2019 ] os: [ macos-13, ubuntu-20.04, windows-2019 ]
target: [ 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, 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 # For g++, we test the oldest compiler on Ubuntu 20.04, which is GCC-9
g++-11, g++-10, g++-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-2015 }
- { os: ubuntu-20.04, target: msvc-2013 } - { os: ubuntu-20.04, target: msvc-2013 }
# OSX only supports clang # OSX only supports clang
- { os: macOS-12, target: g++-11 } - { os: macos-13, target: g++-11 }
- { os: macOS-12, target: g++-10 } - { os: macos-13, target: g++-10 }
- { os: macOS-12, target: g++-9 } - { os: macos-13, target: g++-9 }
- { os: macOS-12, target: msvc-2019 } - { os: macos-13, target: msvc-2019 }
- { os: macOS-12, target: msvc-2017 } - { os: macos-13, target: msvc-2017 }
- { os: macOS-12, target: msvc-2015 } - { os: macos-13, target: msvc-2015 }
- { os: macOS-12, target: msvc-2013 } - { os: macos-13, target: msvc-2013 }
# We don't test g++ on Windows as DMD only mangles for MSVC # We don't test g++ on Windows as DMD only mangles for MSVC
- { os: windows-2019, target: g++-11 } - { os: windows-2019, target: g++-11 }
- { os: windows-2019, target: g++-10 } - { os: windows-2019, target: g++-10 }
@ -126,13 +126,13 @@ jobs:
- { target: g++-9, compiler: g++, cxx-version: 9.4.0, major: 9 } - { target: g++-9, compiler: g++, cxx-version: 9.4.0, major: 9 }
# Platform boilerplate # Platform boilerplate
- { os: ubuntu-20.04, arch: x86_64-linux-gnu-ubuntu-20.04 } - { 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 # 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 # Those targets will generate artifacts that can be used by other testers
- { storeArtifacts: false } - { storeArtifacts: false }
- { os: ubuntu-20.04, target: g++-9, storeArtifacts: true } - { 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 } #- { os: windows-2019, target: msvc-2019, storeArtifacts: true }
# We're using the latest available images at the time of this commit. # 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 # 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), # 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. # 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 # Note: heredoc shouldn't be indented
cat << 'EOF' > ${TMP_CC}-wrapper cat << 'EOF' > ${TMP_CC}-wrapper
#!/bin/bash #!/bin/bash
@ -227,11 +227,15 @@ jobs:
chmod +x ${TMP_CC}-wrapper ${TMP_CC}++-wrapper chmod +x ${TMP_CC}-wrapper ${TMP_CC}++-wrapper
fi 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' - name: '[Posix] Setup environment variables'
if: matrix.compiler == 'clang' && runner.os != 'Windows' if: matrix.compiler == 'clang' && runner.os != 'Windows'
run: | run: |
TMP_CC='${{ github.workspace }}/clang+llvm-${{ matrix.cxx-version }}-${{ matrix.arch }}/bin/clang' 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 "CC=${TMP_CC}-wrapper" >> $GITHUB_ENV
echo "CXX=${TMP_CC}++-wrapper" >> $GITHUB_ENV echo "CXX=${TMP_CC}++-wrapper" >> $GITHUB_ENV
echo "SDKROOT=$(xcrun --show-sdk-path)" >> $GITHUB_ENV echo "SDKROOT=$(xcrun --show-sdk-path)" >> $GITHUB_ENV

12
ci/README.md
View file

@ -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) **Config**: [azure-pipelines.yml](https://github.com/dlang/dmd/blob/master/.github/workflows/runnable_cxx.yml)
**Checks**: **Checks**:
- C++ interop tests / Run (macOS-12, clang-13.0.0) - C++ interop tests / Run (macos-13, clang-13.0.0)
- C++ interop tests / Run (macOS-12, clang-12.0.0) - C++ interop tests / Run (macos-13, clang-12.0.0)
- C++ interop tests / Run (macOS-12, clang-11.0.0) - C++ interop tests / Run (macos-13, clang-11.0.0)
- C++ interop tests / Run (macOS-12, clang-10.0.0) - C++ interop tests / Run (macos-13, clang-10.0.0)
- C++ interop tests / Run (macOS-12, clang-9.0.0) - C++ interop tests / Run (macos-13, clang-9.0.0)
- C++ interop tests / Run (macOS-12, clang-8.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-13.0.0)
- C++ interop tests / Run (ubuntu-20.04, clang-12.0.0) - C++ interop tests / Run (ubuntu-20.04, clang-12.0.0)
- C++ interop tests / Run (ubuntu-20.04, clang-11.0.0) - C++ interop tests / Run (ubuntu-20.04, clang-11.0.0)