Merge pull request #5996 from nextcloud/ci/updateCiImages

update main CI image to get newer Qt, Java and other dependencies
This commit is contained in:
Matthieu Gallien 2023-08-22 17:59:46 +02:00 committed by GitHub
commit 2b4ee541bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions

View file

@ -4,7 +4,7 @@ name: qt-5.15
steps:
- name: cmake
image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-11
image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-13
volumes:
- name: build
path: /drone/build
@ -13,7 +13,7 @@ steps:
- cmake -G Ninja -DCMAKE_C_COMPILER=gcc-11 -DCMAKE_CXX_COMPILER=g++-11 -DCMAKE_BUILD_TYPE=Debug -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:client-5.15-11
image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-13
volumes:
- name: build
path: /drone/build
@ -22,7 +22,7 @@ steps:
- ninja
- name: test
image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-11
image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-13
volumes:
- name: build
path: /drone/build
@ -74,7 +74,7 @@ name: qt-5.15-clang
steps:
- name: cmake
image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-11
image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-13
volumes:
- name: build
path: /drone/build
@ -82,7 +82,7 @@ steps:
- cd /drone/build
- cmake -G Ninja -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_C_COMPILER=clang-14 -DCMAKE_CXX_COMPILER=clang++-14 -DCMAKE_BUILD_TYPE=Debug -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:client-5.15-11
image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-13
volumes:
- name: build
path: /drone/build
@ -90,7 +90,7 @@ steps:
- cd /drone/build
- ninja
- name: test
image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-11
image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-13
volumes:
- name: build
path: /drone/build
@ -196,4 +196,4 @@ trigger:
- push
---
kind: signature
hmac: de1a119efa45cbf852b2f13da0f1b598686bdc1609f3cf95cc704f2ea51254ee
hmac: 6a5c4e8717215aed1038ceafa9bb95cf0a6dbdeddaf0bb9fcdf016b514acfd06

View file

@ -9,7 +9,7 @@ jobs:
build:
name: Build
runs-on: ubuntu-22.04
container: ghcr.io/nextcloud/continuous-integration-client:client-5.15-11
container: ghcr.io/nextcloud/continuous-integration-client:client-5.15-13
env:
SONAR_SERVER_URL: "https://sonarcloud.io"
BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed