diff options
| author | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-09-10 18:16:33 +0200 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-09-14 14:32:10 +0000 |
| commit | 018194f4a832b406999762fdac3417dfbcb9b9cb (patch) | |
| tree | f2da37eee53de5a550c8e60fd8b838bf29b956d3 /.github/workflows/main.yml | |
| parent | 39e8a5773efadb653da2f59a8f758b697cecf569 (diff) | |
Upgrade linux images to Ubuntu 20.04
Change-Id: I4dcfbe846f7847874908ed8ad84ac615a5a739c1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to '.github/workflows/main.yml')
| -rw-r--r-- | .github/workflows/main.yml | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4d9ed2280..ff7ea474d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -37,14 +37,14 @@ jobs: path: ~/.ccache key: ${{ runner.os }}-${{ matrix.config.cacheid }}-ccache-${{ steps.get-timestamp.outputs.timestamp }} restore-keys: ${{ runner.os }}-${{ matrix.config.cacheid }}-ccache- - - name: Pull the Bionic Image - run: docker-compose pull bionic + - name: Pull the Focal Image + run: docker-compose pull focal - name: Print ccache stats - run: docker-compose run bionic ccache -s + run: docker-compose run focal ccache -s - name: Build Qbs - run: docker-compose run bionic ${{ matrix.config.script }} + run: docker-compose run focal ${{ matrix.config.script }} - name: Print ccache stats - run: docker-compose run bionic ccache -s + run: docker-compose run focal ccache -s - name: Upload artifacts uses: 'actions/upload-artifact@v2' with: @@ -92,14 +92,14 @@ jobs: path: ~/.ccache key: ${{ runner.os }}-${{ matrix.config.cacheid }}-ccache-${{ steps.get-timestamp.outputs.timestamp }} restore-keys: ${{ runner.os }}-${{ matrix.config.cacheid }}-ccache- - - name: Pull the Bionic Image - run: docker-compose pull bionic + - name: Pull the Focal Image + run: docker-compose pull focal - name: Print ccache stats - run: docker-compose run bionic ccache -s + run: docker-compose run focal ccache -s - name: Build Qbs - run: docker-compose run bionic ${{ matrix.config.script }} + run: docker-compose run focal ${{ matrix.config.script }} - name: Print ccache stats - run: docker-compose run bionic ccache -s + run: docker-compose run focal ccache -s build-macos: name: Build on macOS @@ -226,25 +226,25 @@ jobs: config: - { name: 'Run Linux tests (gcc)', - image: 'bionic', + image: 'focal', profile: 'qt-gcc_64', script: './scripts/test-qbs.sh', } - { name: 'Run Linux tests (clang)', - image: 'bionic', + image: 'focal', profile: 'qt-clang_64', script: './scripts/test-qbs.sh', } - { name: 'Run Android tests (Qt 5.13)', - image: 'bionic-android-513', + image: 'focal-android-513', profile: '', script: './scripts/test-qt-for-android.sh', } - { name: 'Run Android tests (Qt 5.14)', - image: 'bionic-android-514', + image: 'focal-android-514', profile: '', script: './scripts/test-qt-for-android.sh', } |