diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2020-09-01 21:25:49 +0200 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-09-02 13:56:37 +0000 |
| commit | 98c36792795f63a8157330bfb4dd282cbb72b437 (patch) | |
| tree | 2b0da185dedcf1285f967fb97a207fb9af8de24d | |
| parent | 7c15b368e2adcb917095cc46d07c7da5e97cc76d (diff) | |
GitHub actions: fix typo in cache id
Change-Id: I0faf0d059c53bc4140ac617d9127abe1c0b9b751
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | .github/workflows/main.yml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a852b8809..247543f72 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,7 +15,7 @@ jobs: name: 'Build on Linux (gcc)', options: 'modules.cpp.compilerWrapper:ccache modules.qbs.debugInformation:true modules.qbsbuildconfig.enableBundledQt:true', script: './scripts/build-qbs-with-qbs.sh', - cacheid: '{{ runner.os }}-gcc-ccache', + cacheid: 'gcc', } env: BUILD_OPTIONS: ${{ matrix.config.options }} @@ -33,7 +33,7 @@ jobs: uses: actions/cache@v2 with: path: ~/.ccache - key: ${{ matrix.config.cacheid }}-${{ steps.ccache_cache_timestamp.outputs.timestamp }} + key: ${{ runner.os }}-${{ matrix.config.cacheid }}-ccache-${{ steps.ccache_cache_timestamp.outputs.timestamp }} restore-keys: ${{ matrix.config.cacheid }} - name: Pull the Bionic Image run: docker-compose pull bionic @@ -63,18 +63,18 @@ jobs: name: 'Build on Linux (clang_tidy)', script: './scripts/run-analyzer.sh', options: 'profile:qt-clang_64 modules.cpp.compilerWrapper:ccache', - cacheid: '{{ runner.os }}-clang-ccache', + cacheid: 'clang', } - { name: 'Build on Linux (CMake)', script: './scripts/build-qbs-with-cmake.sh', - cacheid: '{{ runner.os }}-cmake-ccache', + cacheid: 'cmake', } - { name: 'Build on Linux (QMake)', script: './scripts/build-qbs-with-qmake.sh', options: 'CONFIG+=ccache', - cacheid: '{{ runner.os }}-qmake-ccache', + cacheid: 'qmake', } env: BUILD_OPTIONS: ${{ matrix.config.options }} @@ -92,7 +92,7 @@ jobs: uses: actions/cache@v2 with: path: ~/.ccache - key: ${{ matrix.config.cacheid }}-${{ steps.ccache_cache_timestamp.outputs.timestamp }} + key: ${{ runner.os }}-${{ matrix.config.cacheid }}-ccache-${{ steps.ccache_cache_timestamp.outputs.timestamp }} restore-keys: ${{ matrix.config.cacheid }} - name: Pull the Bionic Image run: docker-compose pull bionic |