diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2021-12-20 20:18:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-20 20:18:40 +0100 |
| commit | dad309d7fca5479ce936f320911df2221a78e43c (patch) | |
| tree | e64bb71996b87300e261ea0771ea579c90c449a2 /.github | |
| parent | d3bd73b2143eb0b75306c4da31cf1d92424432f3 (diff) | |
| parent | 30369451f44bd7696932b02ce38168864c4eb872 (diff) | |
| download | PROJ-dad309d7fca5479ce936f320911df2221a78e43c.tar.gz PROJ-dad309d7fca5479ce936f320911df2221a78e43c.zip | |
Merge pull request #2980 from rouault/cmake_warn_googletest
CMake: fix warning with external googletest
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/linux_gcc_5_4.yml (renamed from .github/workflows/linux_gcc_4_8.yml) | 10 | ||||
| -rwxr-xr-x | .github/workflows/linux_gcc_5_4/start.sh (renamed from .github/workflows/linux_gcc_4_8/start.sh) | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/.github/workflows/linux_gcc_4_8.yml b/.github/workflows/linux_gcc_5_4.yml index 1f37785c..7d8744ea 100644 --- a/.github/workflows/linux_gcc_4_8.yml +++ b/.github/workflows/linux_gcc_5_4.yml @@ -1,10 +1,10 @@ -name: Linux GCC 4.8 +name: Linux GCC 5.4 on: [push, pull_request] jobs: - linux_gcc_4_8: + linux_gcc_5_4: runs-on: ubuntu-latest if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')" steps: @@ -17,11 +17,11 @@ jobs: with: path: | ${{ github.workspace }}/ccache.tar.gz - key: ${{ runner.os }}-cache-gcc-4-8-${{ github.run_id }} - restore-keys: ${{ runner.os }}-cache-gcc-4-8- + key: ${{ runner.os }}-cache-gcc-5-4-${{ github.run_id }} + restore-keys: ${{ runner.os }}-cache-gcc-5-4- - name: Run - run: docker run -e CI -e WORK_DIR="$PWD" -v $PWD:$PWD ubuntu:16.04 $PWD/.github/workflows/linux_gcc_4_8/start.sh + run: docker run -e CI -e WORK_DIR="$PWD" -v $PWD:$PWD ubuntu:16.04 $PWD/.github/workflows/linux_gcc_5_4/start.sh - name: Coveralls uses: coverallsapp/github-action@v1.1.2 diff --git a/.github/workflows/linux_gcc_4_8/start.sh b/.github/workflows/linux_gcc_5_4/start.sh index eb03d78d..1dd8e3b0 100755 --- a/.github/workflows/linux_gcc_4_8/start.sh +++ b/.github/workflows/linux_gcc_5_4/start.sh @@ -9,7 +9,7 @@ export TRAVIS_BUILD_DIR="$WORK_DIR" apt update -y DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - autoconf automake libtool g++-4.8 sqlite3 \ + autoconf automake libtool g++ sqlite3 \ python3-pip python3-setuptools \ make cmake ccache pkg-config tar zip \ libsqlite3-dev libtiff-dev libcurl4-openssl-dev \ @@ -23,8 +23,8 @@ python3 -m pip install --user cmake==3.9.6 export PATH=$HOME/.local/bin:$PATH -export CC="ccache gcc-4.8" -export CXX="ccache g++-4.8" +export CC="ccache gcc" +export CXX="ccache g++" NPROC=$(nproc) echo "NPROC=${NPROC}" |