From 51a86a3441ea675fb6b52375527c3566c01a25d0 Mon Sep 17 00:00:00 2001 From: Andreas Reischuck Date: Sat, 17 Aug 2024 11:42:04 +0200 Subject: [PATCH] Update CMake and Qt versions * update action versions --- .github/workflows/docker_build.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/docker_build.yml b/.github/workflows/docker_build.yml index 9702e66..3658afc 100644 --- a/.github/workflows/docker_build.yml +++ b/.github/workflows/docker_build.yml @@ -9,7 +9,7 @@ jobs: fail-fast: false matrix: distro: ['noble'] - cmake_version: ['3.28.6', '3.29.5'] + cmake_version: ['3.29.7', '3.30.2'] clang: [ {major: 16, source: 'apt'}, {major: 17, source: 'llvm'}, @@ -23,15 +23,15 @@ jobs: qt: [ {version: '6.5.3', arch: 'gcc_64'}, {version: '6.6.3', arch: 'gcc_64'}, - {version: '6.7.1', arch: 'linux_gcc_64'} + {version: '6.7.2', arch: 'linux_gcc_64'} ] include: - distro: noble - cmake_version: '3.29.5' + cmake_version: '3.30.2' clang: {major: 18, source: 'llvm'} gcc: {major: 14, source: 'apt'} - qt: {version: '6.7.1', arch: 'linux_gcc_64'} + qt: {version: '6.7.2', arch: 'linux_gcc_64'} gcc_tags: | arbmind/cmake-gcc:latest ghcr.io/arbmind/cmake-gcc:latest @@ -56,28 +56,28 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Login to DockerHub if: github.event_name != 'pull_request' - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - name: Login to GitHub Container Registry if: github.event_name != 'pull_request' - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - name: CMake ${{ matrix.cmake_version }} + GCC ${{ matrix.gcc.major }} - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v6 with: # buildkitd-flags: --debug target: cmake-gcc @@ -95,7 +95,7 @@ jobs: CMAKE_VERSION=${{ matrix.cmake_version }} - name: CMake ${{ matrix.cmake_version }} + GCC ${{ matrix.gcc.major }} + Qt ${{ matrix.qt.version }} - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v6 with: target: cmake-gcc-qt push: ${{ github.event_name != 'pull_request' }} @@ -112,7 +112,7 @@ jobs: CMAKE_VERSION=${{ matrix.cmake_version }} - name: CMake ${{ matrix.cmake_version }} + GCC ${{ matrix.gcc.major }} + QtGui ${{ matrix.qt.version }} + Dev - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v6 with: target: cmake-qtgui-dev push: ${{ github.event_name != 'pull_request' }} @@ -133,7 +133,7 @@ jobs: QTGUI_BASE_IMAGE=cmake-gcc-qt - name: CMake ${{ matrix.cmake_version }} + Clang ${{ matrix.clang.major }} - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v6 with: target: cmake-clang push: ${{ github.event_name != 'pull_request' }} @@ -150,7 +150,7 @@ jobs: CMAKE_VERSION=${{ matrix.cmake_version }} - name: CMake ${{ matrix.cmake_version }} + Clang ${{ matrix.clang.major }} + LibStdC++ ${{ matrix.gcc.major }} - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v6 with: target: cmake-clang-libstdcpp push: ${{ github.event_name != 'pull_request' }} @@ -169,7 +169,7 @@ jobs: CMAKE_VERSION=${{ matrix.cmake_version }} - name: CMake ${{ matrix.cmake_version }} + Clang ${{ matrix.clang.major }} + LibStdC++ ${{ matrix.gcc.major }} + Qt ${{ matrix.qt.version }} - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v6 with: target: cmake-clang-libstdcpp-qt push: ${{ github.event_name != 'pull_request' }} @@ -188,7 +188,7 @@ jobs: CMAKE_VERSION=${{ matrix.cmake_version }} - name: CMake ${{ matrix.cmake_version }} + Clang ${{ matrix.clang.major }} + LibStdC++ ${{ matrix.gcc.major }} + QtGui ${{ matrix.qt.version }} + Dev - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v6 with: target: cmake-qtgui-dev push: ${{ github.event_name != 'pull_request' }}