From 73d76d2e0e6b26f3f03ef7c356bd9e13ef733ebd Mon Sep 17 00:00:00 2001 From: Luigi Ballabio Date: Fri, 26 Jan 2024 13:05:58 +0100 Subject: [PATCH] Remove job from main CI build matrix if ccache is not working. Sidestep ccache and use full compilation in weekly CI build. --- .github/workflows/linux-full-tests.yml | 12 ++---------- .github/workflows/linux-nondefault.yml | 2 +- .github/workflows/linux.yml | 22 +--------------------- 3 files changed, 4 insertions(+), 32 deletions(-) diff --git a/.github/workflows/linux-full-tests.yml b/.github/workflows/linux-full-tests.yml index 12ad1f30e1b..527dc395e37 100644 --- a/.github/workflows/linux-full-tests.yml +++ b/.github/workflows/linux-full-tests.yml @@ -40,7 +40,7 @@ jobs: tag: hirsute cc: gcc cxx: g++ - - name: "gcc 11.x (Boost 1.82)" + - name: "gcc 11.4 (Boost 1.82)" shortname: gcc11 tag: jammy cc: gcc @@ -196,21 +196,13 @@ jobs: container: ghcr.io/lballabio/quantlib-devenv:${{ matrix.tag }} steps: - uses: actions/checkout@v3 - - name: Cache - uses: hendrikmuhs/ccache-action@v1.2 - with: - key: linux-ci-build-${{ matrix.shortname }}-${{ github.ref }} - restore-keys: | - linux-ci-build-${{ matrix.shortname }}-${{ github.ref }} - linux-ci-build-${{ matrix.shortname }}-refs/heads/master - linux-ci-build-${{ matrix.shortname }}- - name: Compiler version run: | ${{ matrix.cc }} --version - name: Build run: | ./autogen.sh - ./configure --disable-static ${{ matrix.configureflags }} CC="ccache ${{ matrix.cc }}" CXX="ccache ${{ matrix.cxx }}" CXXFLAGS="-O2 -g0 -Wall -Wno-unknown-pragmas -Werror ${{ matrix.cxxflags }}" + ./configure --disable-static ${{ matrix.configureflags }} CC="${{ matrix.cc }}" CXX="${{ matrix.cxx }}" CXXFLAGS="-O2 -g0 -Wall -Wno-unknown-pragmas -Werror ${{ matrix.cxxflags }}" make -j 4 - name: Run tests run: | diff --git a/.github/workflows/linux-nondefault.yml b/.github/workflows/linux-nondefault.yml index d3e03fcb1a3..d7ad3f92632 100644 --- a/.github/workflows/linux-nondefault.yml +++ b/.github/workflows/linux-nondefault.yml @@ -40,7 +40,7 @@ jobs: tag: hirsute cc: gcc cxx: g++ - - name: "gcc 11.x (Boost 1.82)" + - name: "gcc 11.4 (Boost 1.82)" shortname: gcc11 tag: jammy cc: gcc diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 537cb16a5c3..32f8632397d 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -7,21 +7,6 @@ jobs: fail-fast: false matrix: include: - - name: "gcc 5.4 (Boost 1.66)" - shortname: gcc5 - tag: xenial - cc: gcc - cxx: g++ - - name: "gcc 6.3 (Boost 1.66)" - shortname: gcc6 - tag: zesty - cc: gcc - cxx: g++ - - name: "gcc 7.4 (Boost 1.72)" - shortname: gcc7 - tag: bionic - cc: gcc - cxx: g++ - name: "gcc 8.3 (Boost 1.72)" shortname: gcc8 tag: cosmic @@ -37,7 +22,7 @@ jobs: tag: hirsute cc: gcc cxx: g++ - - name: "gcc 11.x (Boost 1.82)" + - name: "gcc 11.4 (Boost 1.82)" shortname: gcc11 tag: jammy cc: gcc @@ -54,11 +39,6 @@ jobs: cc: gcc cxx: g++ tests: true - - name: "Clang 6 (Boost 1.72)" - shortname: clang6 - tag: bionic - cc: clang - cxx: clang++ - name: "Clang 7 (Boost 1.72)" shortname: clang7 tag: cosmic