update ci (#363)

Neargye · Jun 29, 2024 · 2ac8152 · 2ac8152
1 parent f2ad79f
commit 2ac8152
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 21 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -11,8 +11,8 @@ jobs:
       fail-fast: false
       matrix:
         config:
-        - { os: macos-11  } # https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11-Readme.md#xcode
-        - { os: macos-12 } # https://github.com/actions/virtual-environments/blob/main/images/macos/macos-12-Readme.md#xcode
+        - { os: macos-13 } # https://github.com/actions/virtual-environments/blob/main/images/macos/macos-13-Readme.md#xcode
+        - { os: macos-14 } # https://github.com/actions/virtual-environments/blob/main/images/macos/macos-14-Readme.md#xcode
 
     name: "${{ matrix.config.os }}"
     steps:

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -10,20 +10,20 @@ jobs:
       fail-fast: false
       matrix:
         compiler:
-        - { cc: "gcc-9",    cxx: "g++-9",      os: "ubuntu-20.04", nonascii: "FALSE" }
         - { cc: "gcc-10",   cxx: "g++-10",     os: "ubuntu-20.04", nonascii: "TRUE" }
         - { cc: "gcc-10",   cxx: "g++-10",     os: "ubuntu-20.04", nonascii: "FALSE" }
-        - { cc: "gcc-11",   cxx: "g++-11",     os: "ubuntu-20.04", nonascii: "TRUE" }
-        - { cc: "gcc-11",   cxx: "g++-11",     os: "ubuntu-20.04", nonascii: "FALSE" }
+        - { cc: "gcc-11",   cxx: "g++-11",     os: "ubuntu-22.04", nonascii: "TRUE" }
+        - { cc: "gcc-11",   cxx: "g++-11",     os: "ubuntu-22.04", nonascii: "FALSE" }
         - { cc: "gcc-12",   cxx: "g++-12",     os: "ubuntu-22.04", nonascii: "FALSE" }
-        - { cc: "clang-9",  cxx: "clang++-9",  os: "ubuntu-20.04", nonascii: "FALSE" }
+        - { cc: "gcc-13",   cxx: "g++-13",     os: "ubuntu-24.04", nonascii: "FALSE" }
+        - { cc: "gcc-14",   cxx: "g++-14",     os: "ubuntu-24.04", nonascii: "FALSE" }
         - { cc: "clang-10", cxx: "clang++-10", os: "ubuntu-20.04", nonascii: "FALSE" }
         - { cc: "clang-11", cxx: "clang++-11", os: "ubuntu-20.04", nonascii: "FALSE" }
-        - { cc: "clang-12", cxx: "clang++-12", os: "ubuntu-20.04", nonascii: "FALSE" }
-        - { cc: "clang-13", cxx: "clang++-13", os: "ubuntu-20.04", nonascii: "FALSE" }
-        - { cc: "clang-14", cxx: "clang++-14", os: "ubuntu-20.04", nonascii: "FALSE" }
-        - { cc: "clang-15", cxx: "clang++-15", os: "ubuntu-20.04", nonascii: "FALSE" }
-        - { cc: "clang-16", cxx: "clang++-16", os: "ubuntu-20.04", nonascii: "FALSE" }
+        - { cc: "clang-12", cxx: "clang++-12", os: "ubuntu-22.04", nonascii: "FALSE" }
+        - { cc: "clang-13", cxx: "clang++-13", os: "ubuntu-22.04", nonascii: "FALSE" }
+        - { cc: "clang-14", cxx: "clang++-14", os: "ubuntu-22.04", nonascii: "FALSE" }
+        - { cc: "clang-15", cxx: "clang++-15", os: "ubuntu-22.04", nonascii: "FALSE" }
+        - { cc: "clang-16", cxx: "clang++-16", os: "ubuntu-24.04", nonascii: "FALSE" }
 
     name: "${{ format('{0} NONASCII={1}', matrix.compiler.cc, matrix.compiler.nonascii) }}"
     runs-on: ${{ matrix.compiler.os }}
@@ -33,16 +33,6 @@ jobs:
     - name: Configure clang
       run: |
         if [[ "${{ matrix.compiler.cc }}" == "clang"* ]]; then
-          wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -
-          sudo apt-add-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-9 main"
-          sudo apt-add-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-10 main"
-          sudo apt-add-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-11 main"
-          sudo apt-add-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-12 main"
-          sudo apt-add-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-13 main"
-          sudo apt-add-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-14 main"
-          sudo apt-add-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-15 main"
-          sudo apt-add-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-16 main"
-          sudo apt-add-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal main"
           sudo apt update
           sudo apt install ${{ matrix.compiler.cc }} -y
         fi