Skip to content

Commit c60942a

Browse files
committed
update ci
1 parent c1aa6de commit c60942a

3 files changed

Lines changed: 26 additions & 6 deletions

File tree

.github/workflows/macos.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ jobs:
1111
fail-fast: false
1212
matrix:
1313
config:
14-
- { os: macos-14 }
15-
- { os: macos-15 }
14+
- { os: macos-14 } # https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md#xcode (Apple Silicon M1)
15+
- { os: macos-15 } # https://github.com/actions/runner-images/blob/main/images/macos/macos-15-Readme.md#xcode (Apple Silicon M2)
1616

1717
name: "${{ matrix.config.os }}"
1818
steps:

.github/workflows/ubuntu.yml

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,16 @@ jobs:
1515
- { cc: "gcc-12", cxx: "g++-12", os: "ubuntu-22.04", nonascii: "FALSE" }
1616
- { cc: "gcc-13", cxx: "g++-13", os: "ubuntu-24.04", nonascii: "FALSE" }
1717
- { cc: "gcc-14", cxx: "g++-14", os: "ubuntu-24.04", nonascii: "FALSE" }
18+
- { cc: "gcc-15", cxx: "g++-15", os: "ubuntu-24.04", nonascii: "FALSE" }
1819
- { cc: "clang-13", cxx: "clang++-13", os: "ubuntu-22.04", nonascii: "FALSE" }
1920
- { cc: "clang-14", cxx: "clang++-14", os: "ubuntu-22.04", nonascii: "FALSE" }
2021
- { cc: "clang-15", cxx: "clang++-15", os: "ubuntu-22.04", nonascii: "FALSE" }
2122
- { cc: "clang-16", cxx: "clang++-16", os: "ubuntu-24.04", nonascii: "FALSE" }
22-
- { cc: "clang-17", cxx: "clang++-16", os: "ubuntu-24.04", nonascii: "FALSE" }
23-
- { cc: "clang-18", cxx: "clang++-16", os: "ubuntu-24.04", nonascii: "FALSE" }
23+
- { cc: "clang-17", cxx: "clang++-17", os: "ubuntu-24.04", nonascii: "FALSE" }
24+
- { cc: "clang-18", cxx: "clang++-18", os: "ubuntu-24.04", nonascii: "FALSE" }
25+
- { cc: "clang-19", cxx: "clang++-19", os: "ubuntu-24.04", nonascii: "FALSE" }
26+
- { cc: "clang-20", cxx: "clang++-20", os: "ubuntu-24.04", nonascii: "FALSE" }
27+
- { cc: "clang-21", cxx: "clang++-21", os: "ubuntu-24.04", nonascii: "FALSE" }
2428

2529
name: "${{ format('{0} NONASCII={1}', matrix.compiler.cc, matrix.compiler.nonascii) }}"
2630
runs-on: ${{ matrix.compiler.os }}
@@ -30,6 +34,22 @@ jobs:
3034
- name: Configure clang
3135
run: |
3236
if [[ "${{ matrix.compiler.cc }}" == "clang"* ]]; then
37+
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
38+
# Add repositories based on Ubuntu version
39+
if [[ "${{ matrix.compiler.os }}" == "ubuntu-22.04" ]]; then
40+
sudo apt-add-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-13 main"
41+
sudo apt-add-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-14 main"
42+
sudo apt-add-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-15 main"
43+
sudo apt-add-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main"
44+
sudo apt-add-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main"
45+
sudo apt-add-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main"
46+
sudo apt-add-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy main"
47+
elif [[ "${{ matrix.compiler.os }}" == "ubuntu-24.04" ]]; then
48+
sudo apt-add-repository "deb http://apt.llvm.org/noble/ llvm-toolchain-noble-19 main"
49+
sudo apt-add-repository "deb http://apt.llvm.org/noble/ llvm-toolchain-noble-20 main"
50+
sudo apt-add-repository "deb http://apt.llvm.org/noble/ llvm-toolchain-noble-21 main"
51+
sudo apt-add-repository "deb http://apt.llvm.org/noble/ llvm-toolchain-noble main"
52+
fi
3353
sudo apt update
3454
sudo apt install ${{ matrix.compiler.cc }} -y
3555
fi

.github/workflows/windows.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ jobs:
1111
fail-fast: false
1212
matrix:
1313
config:
14-
- { os: windows-2022, vs: "Visual Studio 2022" }
15-
- { os: windows-2025, vs: "Visual Studio 2025" }
14+
- { os: windows-2022, vs: "Visual Studio 2022" } # https://github.com/actions/runner-images/blob/main/images/windows/Windows2022-Readme.md#visual-studio-enterprise-2022
15+
- { os: windows-2025, vs: "Visual Studio 2025" } # https://github.com/actions/runner-images/blob/main/images/windows/Windows2025-Readme.md#visual-studio-enterprise-2025
1616

1717
name: "${{ matrix.config.vs }}"
1818
steps:

0 commit comments

Comments
 (0)