Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-13 22:27:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

👷 Fixed CI

Browse source
This commit is contained in:
Edgar 2025-03-04 10:58:16 +01:00 committed by Julian Groß
parent 18d89fa81b
commit 1e28efc1b4
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.github/workflows/master_build.yml vendored
View file

@ -197,10 +197,17 @@ jobs:
shell: bash
- name: Configure CMake
if: startsWith(matrix.os, 'Windows') == false
shell: bash
# This syntax requires CMake 3.23
run: cmake --preset conan-${BUILD_TYPE,,} -DCLIENT_ONLY:BOOLEAN=$CLIENT_ONLY -DBYPASS_SIGNING:BOOLEAN=TRUE $CMAKE_EXTRA
- name: Configure CMake (Windows)
if: startsWith(matrix.os, 'Windows')
shell: bash
# This syntax requires CMake 3.23
run: cmake --preset conan-default -DCLIENT_ONLY:BOOLEAN=$CLIENT_ONLY -DBYPASS_SIGNING:BOOLEAN=TRUE $CMAKE_EXTRA
- name: Build application
working-directory: ${{runner.workspace}}/build
shell: bash

11
.github/workflows/pr_build.yml vendored
View file

@ -61,7 +61,7 @@ jobs:
runner: [self_hosted, type-cpx41, image-x86-app-docker-ce]
arch: amd64
build_type: full
qt_source: source
qt_source: system
apt-dependencies: libxcb-glx0-dev # add missing dependencies to docker image when convenient
image: docker.io/overte/overte-full-build:0.1.6-ubuntu-20.04-amd64
# Android builds are currently failing
@ -73,7 +73,7 @@ jobs:
runner: [self_hosted, type-cax41, image-arm-app-docker-ce]
arch: aarch64
build_type: full
qt_source: source
qt_source: system
apt-dependencies: libxcb-glx0-dev # add missing dependencies to docker image when convenient
image: docker.io/overte/overte-full-build:0.1.6-ubuntu-22.04-aarch64
fail-fast: false
@ -253,10 +253,17 @@ jobs:
shell: bash
- name: Configure CMake
if: startsWith(matrix.os, 'Windows') == false
shell: bash
# This syntax requires CMake 3.23
run: cmake --preset conan-${BUILD_TYPE,,} $CMAKE_EXTRA
- name: Configure CMake (Windows)
if: startsWith(matrix.os, 'Windows')
shell: bash
# This syntax requires CMake 3.23
run: cmake --preset conan-default $CMAKE_EXTRA
- name: Build Application
if: matrix.build_type == 'full' || matrix.build_type == 'client'
working-directory: build