Skip to content

Commit 795c739

Browse files
committed
switch drone ci to Qt 6.8.0 based images
Signed-off-by: Matthieu Gallien <[email protected]>
1 parent 1964dd5 commit 795c739

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

.drone.yml

+13-13
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.7.3-1
7+
image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.8.0-1
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.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 -DADD_E2E_TESTS=ON
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
1414

1515
- name: compile
16-
image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.7.3-1
16+
image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.8.0-1
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.7.3-1
25+
image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.8.0-1
2626
volumes:
2727
- name: build
2828
path: /drone/build
@@ -38,7 +38,7 @@ services:
3838
image: ghcr.io/nextcloud/continuous-integration-shallow-server:latest # also change in updateScreenshots.sh
3939
environment:
4040
EVAL: true
41-
SERVER_VERSION: 'stable28'
41+
SERVER_VERSION: 'stable30'
4242
commands:
4343
- BRANCH="$SERVER_VERSION" /usr/local/bin/initnc.sh
4444
- echo 127.0.0.1 server >> /etc/hosts
@@ -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.7.3-1
82+
image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.8.0-1
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.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 -DADD_E2E_TESTS=ON
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
8989
- name: compile
90-
image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.7.3-1
90+
image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.8.0-1
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.7.3-1
98+
image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.8.0-1
9999
volumes:
100100
- name: build
101101
path: /drone/build
@@ -111,7 +111,7 @@ services:
111111
image: ghcr.io/nextcloud/continuous-integration-shallow-server:latest # also change in updateScreenshots.sh
112112
environment:
113113
EVAL: true
114-
SERVER_VERSION: 'stable28'
114+
SERVER_VERSION: 'stable30'
115115
commands:
116116
- BRANCH="$SERVER_VERSION" /usr/local/bin/initnc.sh
117117
- echo 127.0.0.1 server >> /etc/hosts
@@ -152,14 +152,14 @@ name: AppImage
152152

153153
steps:
154154
- name: build
155-
image: ghcr.io/nextcloud/continuous-integration-client-appimage-qt6:client-appimage-6.7.3-1
155+
image: ghcr.io/nextcloud/continuous-integration-client-appimage-qt6:client-appimage-6.8.0-1
156156
environment:
157157
CI_UPLOAD_GIT_TOKEN:
158158
from_secret: CI_UPLOAD_GIT_TOKEN
159159
CI_UPLOAD_GIT_USERNAME:
160160
from_secret: CI_UPLOAD_GIT_USERNAME
161161
commands:
162-
- BUILDNR=$DRONE_BUILD_NUMBER VERSION_SUFFIX=$DRONE_PULL_REQUEST BUILD_UPDATER=ON DESKTOP_CLIENT_ROOT=$DRONE_WORKSPACE EXECUTABLE_NAME=nextcloud QT_BASE_DIR=/opt/qt6.7.3 OPENSSL_ROOT_DIR=/usr/local/lib64 /bin/bash -c "./admin/linux/build-appimage.sh"
162+
- BUILDNR=$DRONE_BUILD_NUMBER VERSION_SUFFIX=$DRONE_PULL_REQUEST BUILD_UPDATER=ON DESKTOP_CLIENT_ROOT=$DRONE_WORKSPACE EXECUTABLE_NAME=nextcloud QT_BASE_DIR=/opt/qt6.8.0 OPENSSL_ROOT_DIR=/usr/local/lib64 /bin/bash -c "./admin/linux/build-appimage.sh"
163163
- BUILDNR=$DRONE_BUILD_NUMBER VERSION_SUFFIX=$DRONE_PULL_REQUEST DESKTOP_CLIENT_ROOT=$DRONE_WORKSPACE /bin/bash -c "./admin/linux/upload-appimage.sh" || echo "Upload failed, however this is an optional step."
164164
trigger:
165165
branch:
@@ -206,6 +206,6 @@ trigger:
206206
- push
207207
---
208208
kind: signature
209-
hmac: 1fbd0241ba0d4ea2702804324f4932b3f29d3d937ef75906a529cd00c4252a57
209+
hmac: a3e21446a001d2aadffa4b4f7c1fcc798817d2af582209095cd5bbb6829d55fc
210210

211211
...

0 commit comments

Comments
 (0)