diff --git a/.ci/qt5_14/Dockerfile b/.ci/qt5_14/Dockerfile index 1af781e2abe..8fcc7819b1f 100644 --- a/.ci/qt5_14/Dockerfile +++ b/.ci/qt5_14/Dockerfile @@ -3,7 +3,6 @@ MAINTAINER Matthias Kuhn RUN dnf -y install \ bison \ - ccache \ clang \ clazy \ exiv2-devel \ diff --git a/.ci/qt5_14/build.sh b/.ci/qt5_14/build.sh index a3b57718eee..8102bcb559c 100755 --- a/.ci/qt5_14/build.sh +++ b/.ci/qt5_14/build.sh @@ -3,10 +3,7 @@ mkdir /usr/src/qgis/build cd /usr/src/qgis/build || exit -1 -ccache -s - -ln -s /../../bin/ccache /usr/lib64/ccache/clang -ln -s /../../bin/ccache /usr/lib64/ccache/clang++ +CLANG_WARNINGS="-Wall" cmake -GNinja \ -DWITH_QUICK=OFF \ @@ -28,12 +25,10 @@ cmake -GNinja \ -DWITH_ORACLE=OFF \ -DDISABLE_DEPRECATED=ON \ -DCXX_EXTRA_FLAGS="${CLANG_WARNINGS}" \ - -DCMAKE_C_COMPILER=/usr/lib64/ccache/clang \ - -DCMAKE_CXX_COMPILER=/usr/lib64/ccache/clang++ \ + -DCMAKE_C_COMPILER=/bin/clang \ + -DCMAKE_CXX_COMPILER=/bin/clang++ \ -DADD_CLAZY_CHECKS=ON \ -DWERROR=TRUE \ .. ninja - -ccache -s diff --git a/.github/workflows/qt5_14.yml b/.github/workflows/qt5_14.yml index 18a2de48dc7..dd2cbdcd9d5 100644 --- a/.github/workflows/qt5_14.yml +++ b/.github/workflows/qt5_14.yml @@ -9,6 +9,8 @@ on: - 'src/**' - 'tests/**' - 'CMakeLists.txt' + - '.github/workflows/**' + - '.ci/**' pull_request: branches: - master @@ -17,6 +19,8 @@ on: - 'src/**' - 'tests/**' - 'CMakeLists.txt' + - '.github/workflows/**' + - '.ci/**' jobs: build: @@ -29,14 +33,6 @@ jobs: run: | docker build -t qgis_build_deps -f .ci/qt5_14/Dockerfile . - - - name: Cache - id: cache - uses: actions/cache@v2 - with: - path: ~/.ccache - key: qt514 - - name: Run build run: | - docker run -v ~/.ccache:/root/ccache -v $(pwd):/usr/src/qgis qgis_build_deps /usr/src/qgis/.ci/qt5_14/build.sh + docker run -v $(pwd):/usr/src/qgis qgis_build_deps /usr/src/qgis/.ci/qt5_14/build.sh