Skip to content

Commit 510149b

Browse files
committed
use CI images with Qt 6.8.0
Signed-off-by: Matthieu Gallien <[email protected]>
1 parent ba3ccb9 commit 510149b

5 files changed

+10
-10
lines changed

.github/workflows/clang-tidy-review.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ on:
77
jobs:
88
clang-tidy:
99
runs-on: ubuntu-latest
10-
container: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.7.3-1
10+
container: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.8.0-1
1111
steps:
1212
- uses: actions/checkout@v4
1313
with:
1414
fetch-depth: 2
1515
- name: Prepare compile_commands.json
1616
run: |
17-
cmake -G Ninja -B build -DCMAKE_PREFIX_PATH=/opt/qt6.7.3 -DQT_MAJOR_VERSION=6 -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DBUILD_UPDATER=ON -DBUILD_TESTING=1 -DOPENSSL_ROOT_DIR=/usr/local/lib64
17+
cmake -G Ninja -B build -DCMAKE_PREFIX_PATH=/opt/qt6.8.0 -DQT_MAJOR_VERSION=6 -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DBUILD_UPDATER=ON -DBUILD_TESTING=1 -DOPENSSL_ROOT_DIR=/usr/local/lib64
1818
cd build && ninja
1919
- name: Create results directory
2020
run: |

.github/workflows/linux-appimage.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ jobs:
66
build:
77
name: Linux Appimage Package
88
runs-on: ubuntu-latest
9-
container: ghcr.io/nextcloud/continuous-integration-client-appimage-qt6:client-appimage-6.7.3-1
9+
container: ghcr.io/nextcloud/continuous-integration-client-appimage-qt6:client-appimage-6.8.0-1
1010
steps:
1111
- uses: actions/checkout@v4
1212
with:
1313
fetch-depth: 1
1414
- name: Configure, compile and package
1515
run: |
16-
BUILDNR=${GITHUB_RUN_ID} VERSION_SUFFIX=${GITHUB_HEAD_REF} BUILD_UPDATER=ON DESKTOP_CLIENT_ROOT=`pwd` EXECUTABLE_NAME=nextcloud QT_BASE_DIR=/opt/qt6.7.3 OPENSSL_ROOT_DIR=/usr/local/lib64 /bin/bash -c "./admin/linux/build-appimage.sh"
16+
BUILDNR=${GITHUB_RUN_ID} VERSION_SUFFIX=${GITHUB_HEAD_REF} BUILD_UPDATER=ON DESKTOP_CLIENT_ROOT=`pwd` EXECUTABLE_NAME=nextcloud QT_BASE_DIR=/opt/qt6.8.0 OPENSSL_ROOT_DIR=/usr/local/lib64 /bin/bash -c "./admin/linux/build-appimage.sh"
1717
BUILDNR=${GITHUB_RUN_ID} VERSION_SUFFIX=${GITHUB_HEAD_REF} DESKTOP_CLIENT_ROOT=`pwd` /bin/bash -c "./admin/linux/upload-appimage.sh" || echo "Upload failed, however this is an optional step."

.github/workflows/linux-clang-compile-tests.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
build:
77
name: Linux Clang compilation and tests
88
runs-on: ubuntu-latest
9-
container: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.7.3-1
9+
container: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.8.0-1
1010
steps:
1111
- uses: actions/checkout@v4
1212
with:
@@ -15,7 +15,7 @@ jobs:
1515
run: |
1616
mkdir build
1717
cd build
18-
cmake .. -G Ninja -DCMAKE_PREFIX_PATH=/opt/qt6.7.3 -DCMAKE_C_COMPILER=clang-14 -DCMAKE_CXX_COMPILER=clang++-14 -DCMAKE_BUILD_TYPE=Debug -DQT_MAJOR_VERSION=6 -DQUICK_COMPILER=ON -DBUILD_UPDATER=ON -DBUILD_TESTING=1 -DCMAKE_CXX_FLAGS=-Werror -DOPENSSL_ROOT_DIR=/usr/local/lib64
18+
cmake .. -G Ninja -DCMAKE_PREFIX_PATH=/opt/qt6.8.0 -DCMAKE_C_COMPILER=clang-14 -DCMAKE_CXX_COMPILER=clang++-14 -DCMAKE_BUILD_TYPE=Debug -DQT_MAJOR_VERSION=6 -DQUICK_COMPILER=ON -DBUILD_UPDATER=ON -DBUILD_TESTING=1 -DCMAKE_CXX_FLAGS=-Werror -DOPENSSL_ROOT_DIR=/usr/local/lib64
1919
ninja
2020
- name: Run tests
2121
run: |

.github/workflows/linux-gcc-compile-tests.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
build:
77
name: Linux GCC compilation and tests
88
runs-on: ubuntu-latest
9-
container: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.7.3-1
9+
container: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.8.0-1
1010
steps:
1111
- uses: actions/checkout@v4
1212
with:
@@ -15,7 +15,7 @@ jobs:
1515
run: |
1616
mkdir build
1717
cd build
18-
cmake .. -G Ninja -DCMAKE_PREFIX_PATH=/opt/qt6.7.3 -DCMAKE_C_COMPILER=gcc-11 -DCMAKE_CXX_COMPILER=g++-11 -DCMAKE_BUILD_TYPE=Debug -DQT_MAJOR_VERSION=6 -DQUICK_COMPILER=ON -DBUILD_UPDATER=ON -DBUILD_TESTING=1 -DCMAKE_CXX_FLAGS=-Werror -DOPENSSL_ROOT_DIR=/usr/local/lib64
18+
cmake .. -G Ninja -DCMAKE_PREFIX_PATH=/opt/qt6.8.0 -DCMAKE_C_COMPILER=gcc-11 -DCMAKE_CXX_COMPILER=g++-11 -DCMAKE_BUILD_TYPE=Debug -DQT_MAJOR_VERSION=6 -DQUICK_COMPILER=ON -DBUILD_UPDATER=ON -DBUILD_TESTING=1 -DCMAKE_CXX_FLAGS=-Werror -DOPENSSL_ROOT_DIR=/usr/local/lib64
1919
ninja
2020
- name: Run tests
2121
run: |

.github/workflows/sonarcloud.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
build:
77
name: SonarCloud analysis
88
runs-on: ubuntu-latest
9-
container: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.7.3-1
9+
container: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.8.0-1
1010
env:
1111
SONAR_SERVER_URL: "https://sonarcloud.io"
1212
BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed
@@ -25,7 +25,7 @@ jobs:
2525
run: |
2626
mkdir build
2727
cd build
28-
cmake .. -G Ninja -DCMAKE_PREFIX_PATH=/opt/qt6.7.3 -DCMAKE_C_COMPILER=gcc-11 -DCMAKE_CXX_COMPILER=g++-11 -DCMAKE_BUILD_TYPE=Debug -DQUICK_COMPILER=ON -DBUILD_UPDATER=ON -DBUILD_TESTING=1 -DQT_MAJOR_VERSION=6 -DCMAKE_CXX_FLAGS=-Werror -DOPENSSL_ROOT_DIR=/usr/local/lib64 -DBUILD_COVERAGE=ON -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
28+
cmake .. -G Ninja -DCMAKE_PREFIX_PATH=/opt/qt6.8.0 -DCMAKE_C_COMPILER=gcc-11 -DCMAKE_CXX_COMPILER=g++-11 -DCMAKE_BUILD_TYPE=Debug -DQUICK_COMPILER=ON -DBUILD_UPDATER=ON -DBUILD_TESTING=1 -DQT_MAJOR_VERSION=6 -DCMAKE_CXX_FLAGS=-Werror -DOPENSSL_ROOT_DIR=/usr/local/lib64 -DBUILD_COVERAGE=ON -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
2929
build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} ninja
3030
- name: Run tests
3131
run: |

0 commit comments

Comments
 (0)