Skip to content

Commit

Permalink
Update CMake and Qt versions
Browse files Browse the repository at this point in the history
* update action versions
  • Loading branch information
arBmind committed Aug 17, 2024
1 parent a23ded3 commit 51a86a3
Showing 1 changed file with 15 additions and 15 deletions.
30 changes: 15 additions & 15 deletions .github/workflows/docker_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'},
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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' }}
Expand All @@ -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' }}
Expand All @@ -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' }}
Expand All @@ -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' }}
Expand All @@ -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' }}
Expand All @@ -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' }}
Expand Down

0 comments on commit 51a86a3

Please sign in to comment.