use the correct Qt6 build in newer CI images
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>pull/4584/head
parent
794db304f9
commit
5bed41a670
18
.drone.yml
18
.drone.yml
|
@ -1,10 +1,10 @@
|
|||
---
|
||||
kind: pipeline
|
||||
name: qt-5.15
|
||||
name: drone desktop client
|
||||
|
||||
steps:
|
||||
- name: cmake
|
||||
image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.6.3-1
|
||||
image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.6.3-2
|
||||
volumes:
|
||||
- name: build
|
||||
path: /drone/build
|
||||
|
@ -13,7 +13,7 @@ steps:
|
|||
- cmake -G Ninja -DCMAKE_PREFIX_PATH=/opt/qt6.6.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 -DADD_E2E_TESTS=ON -DECM_ENABLE_SANITIZERS=address -DCMAKE_CXX_FLAGS=-Werror -DOPENSSL_ROOT_DIR=/usr/local/lib64 ../src
|
||||
|
||||
- name: compile
|
||||
image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.6.3-1
|
||||
image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.6.3-2
|
||||
volumes:
|
||||
- name: build
|
||||
path: /drone/build
|
||||
|
@ -22,7 +22,7 @@ steps:
|
|||
- ninja
|
||||
|
||||
- name: test
|
||||
image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.6.3-1
|
||||
image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.6.3-2
|
||||
volumes:
|
||||
- name: build
|
||||
path: /drone/build
|
||||
|
@ -79,7 +79,7 @@ name: qt-5.15-clang
|
|||
|
||||
steps:
|
||||
- name: cmake
|
||||
image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.6.3-1
|
||||
image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.6.3-2
|
||||
volumes:
|
||||
- name: build
|
||||
path: /drone/build
|
||||
|
@ -87,7 +87,7 @@ steps:
|
|||
- cd /drone/build
|
||||
- cmake -G Ninja -DCMAKE_PREFIX_PATH=/opt/qt6.6.3 -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -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 -DADD_E2E_TESTS=ON -DECM_ENABLE_SANITIZERS=address -DCMAKE_CXX_FLAGS=-Werror -DOPENSSL_ROOT_DIR=/usr/local/lib64 ../src
|
||||
- name: compile
|
||||
image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.6.3-1
|
||||
image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.6.3-2
|
||||
volumes:
|
||||
- name: build
|
||||
path: /drone/build
|
||||
|
@ -95,7 +95,7 @@ steps:
|
|||
- cd /drone/build
|
||||
- ninja
|
||||
- name: test
|
||||
image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.6.3-1
|
||||
image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.6.3-2
|
||||
volumes:
|
||||
- name: build
|
||||
path: /drone/build
|
||||
|
@ -152,7 +152,7 @@ name: AppImage
|
|||
|
||||
steps:
|
||||
- name: build
|
||||
image: ghcr.io/nextcloud/continuous-integration-client-appimage-qt6:client-appimage-6.6.3-1
|
||||
image: ghcr.io/nextcloud/continuous-integration-client-appimage-qt6:client-appimage-6.6.3-2
|
||||
environment:
|
||||
CI_UPLOAD_GIT_TOKEN:
|
||||
from_secret: CI_UPLOAD_GIT_TOKEN
|
||||
|
@ -206,6 +206,6 @@ trigger:
|
|||
- push
|
||||
---
|
||||
kind: signature
|
||||
hmac: a1841244986f401565dda5413e5634275376c46ea6a6480ba049d14534c16a36
|
||||
hmac: 418915bcd7a880be3656a8c09aef0f6e7b3721d13f196838f8c5a9de6020f786
|
||||
|
||||
...
|
||||
|
|
|
@ -6,7 +6,7 @@ jobs:
|
|||
build:
|
||||
name: Linux Clang compilation and tests
|
||||
runs-on: ubuntu-latest
|
||||
container: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.6.3-1
|
||||
container: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.6.3-2
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
|
|
|
@ -6,7 +6,7 @@ jobs:
|
|||
build:
|
||||
name: Linux GCC compilation and tests
|
||||
runs-on: ubuntu-latest
|
||||
container: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.6.3-1
|
||||
container: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.6.3-2
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
|
|
|
@ -6,7 +6,7 @@ jobs:
|
|||
build:
|
||||
name: SonarCloud analysis
|
||||
runs-on: ubuntu-latest
|
||||
container: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.6.3-1
|
||||
container: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.6.3-2
|
||||
env:
|
||||
SONAR_SERVER_URL: "https://sonarcloud.io"
|
||||
BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed
|
||||
|
|
Loading…
Reference in New Issue