Skip to content

Commit b95ca11

Browse files
committed
switch to latest Qt 6.8.1 ci image
Signed-off-by: Matthieu Gallien <[email protected]>
1 parent b7d8b14 commit b95ca11

5 files changed

+17
-17
lines changed

.drone.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ name: drone desktop client
44

55
steps:
66
- name: cmake
7-
image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.8.0-1
7+
image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.8.1-2
88
volumes:
99
- name: build
1010
path: /drone/build
1111
commands:
1212
- cd /drone/build
13-
- cmake /drone/src -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 -DADD_E2E_TESTS=ON
13+
- cmake /drone/src -G Ninja -DCMAKE_PREFIX_PATH=/opt/qt -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 -DADD_E2E_TESTS=ON
1414

1515
- name: compile
16-
image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.8.0-1
16+
image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.8.1-2
1717
volumes:
1818
- name: build
1919
path: /drone/build
@@ -22,7 +22,7 @@ steps:
2222
- ninja
2323

2424
- name: test
25-
image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.8.0-1
25+
image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.8.1-2
2626
volumes:
2727
- name: build
2828
path: /drone/build
@@ -79,23 +79,23 @@ name: qt-5.15-clang
7979

8080
steps:
8181
- name: cmake
82-
image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.8.0-1
82+
image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.8.1-2
8383
volumes:
8484
- name: build
8585
path: /drone/build
8686
commands:
8787
- cd /drone/build
88-
- cmake /drone/src -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 -DADD_E2E_TESTS=ON
88+
- cmake /drone/src -G Ninja -DCMAKE_PREFIX_PATH=/opt/qt -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 -DADD_E2E_TESTS=ON
8989
- name: compile
90-
image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.8.0-1
90+
image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.8.1-2
9191
volumes:
9292
- name: build
9393
path: /drone/build
9494
commands:
9595
- cd /drone/build
9696
- ninja
9797
- name: test
98-
image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.8.0-1
98+
image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.8.1-2
9999
volumes:
100100
- name: build
101101
path: /drone/build
@@ -190,6 +190,6 @@ trigger:
190190
- push
191191
---
192192
kind: signature
193-
hmac: aa7314829c450c7ee29eae2fd4ac96d89462dd38234131fa442fbb0b17a8ac64
193+
hmac: 1a7976bb88cfb49b405d88dcef3c3adfe48c7eaa0a1d908b11738447c005375a
194194

195195
...

.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.8.0-1
10+
container: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.8.1-2
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.8.0 -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/qt -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-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.8.0-1
9+
container: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.8.1-2
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.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
18+
cmake .. -G Ninja -DCMAKE_PREFIX_PATH=/opt/qt -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.8.0-1
9+
container: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.8.1-2
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.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
18+
cmake .. -G Ninja -DCMAKE_PREFIX_PATH=/opt/qt -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.8.0-1
9+
container: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.8.1-2
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.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
28+
cmake .. -G Ninja -DCMAKE_PREFIX_PATH=/opt/qt -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)