From 6d1213ac9aace27f61f5fca24836bc89a75c6673 Mon Sep 17 00:00:00 2001 From: John Fultz Date: Sat, 15 Jul 2023 22:22:48 -0500 Subject: More GitHub Actions updates. * Remove deprecated Ubuntu, add new Ubuntu * Fix usage of action/cache * Remove Appveyor * Update .gitignore for clangd cache --- .github/workflows/build.yml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d4c38ad..217b769 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - name: [macos-clang, ubuntu-20.04-clang, ubuntu-18.04-g++, ubuntu-20.04-g++] + name: [macos-clang, ubuntu-20.04-clang, ubuntu-20.04-g++, ubuntu-22.04-clang, ubuntu-22.04-g++] qt_ver: [5.12.0, 5.15.1] include: - name: macos-clang @@ -28,13 +28,18 @@ jobs: env: CXX: clang++ CC: clang - - name: ubuntu-18.04-g++ - os: ubuntu-18.04 + - name: ubuntu-20.04-g++ + os: ubuntu-20.04 env: CXX: g++ CC: gcc - - name: ubuntu-20.04-g++ - os: ubuntu-20.04 + - name: ubuntu-22.04-clang + os: ubuntu-22.04 + env: + CXX: clang++ + CC: clang + - name: ubuntu-22.04-g++ + os: ubuntu-22.04 env: CXX: g++ CC: gcc @@ -82,7 +87,7 @@ jobs: id: cache-qt uses: actions/cache@v3 with: - path: ../Qt + path: Qt key: ${{ runner.os }}-${{ matrix.qt_ver }}-${{ matrix.qt_arch }}-Qt-cache - name: Install Qt -- cgit v1.2.3