From 2c99ccfbe085548a774179b47ce767e3f30a6464 Mon Sep 17 00:00:00 2001 From: Brenden Matthews Date: Sat, 10 Sep 2022 10:19:52 -0500 Subject: [PATCH] Update OS/compilers. --- .github/workflows/build-and-test-linux.yaml | 30 ++++++++++----------- .github/workflows/build-and-test-macos.yaml | 4 +-- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build-and-test-linux.yaml b/.github/workflows/build-and-test-linux.yaml index 97e7b955..a8745c7f 100644 --- a/.github/workflows/build-and-test-linux.yaml +++ b/.github/workflows/build-and-test-linux.yaml @@ -5,34 +5,32 @@ jobs: strategy: matrix: os: - - ubuntu-18.04 - ubuntu-20.04 + - ubuntu-22.04 x11: [ON, OFF] compiler: - clang - gcc compiler_version: - - 7 - - 9 - 10 - 11 + - 12 + - 13 + - 14 + - 15 exclude: - - os: ubuntu-20.04 - compiler: gcc - compiler_version: 7 - compiler: gcc + compiler_version: 13 + - compiler: gcc + compiler_version: 14 + - compiler: gcc + compiler_version: 15 + - compiler: clang + compiler_version: 10 + - compiler: clang compiler_version: 11 - compiler: clang - compiler_version: 7 - - os: ubuntu-18.04 - compiler: clang - compiler_version: 7 - - os: ubuntu-18.04 - compiler: clang - compiler_version: 10 - - os: ubuntu-18.04 - compiler: clang - compiler_version: 11 + compiler_version: 12 runs-on: ${{ matrix.os }} steps: - run: sudo apt-get -qq update diff --git a/.github/workflows/build-and-test-macos.yaml b/.github/workflows/build-and-test-macos.yaml index 2c245e26..f11c4aa8 100644 --- a/.github/workflows/build-and-test-macos.yaml +++ b/.github/workflows/build-and-test-macos.yaml @@ -5,8 +5,8 @@ jobs: strategy: matrix: os: - - macos-10.15 - # - macos-11.0 + - macos-11 + - macos-12 runs-on: ${{ matrix.os }} steps: - name: Install dependencies