diff --git a/.github/workflows/linux_server_build.yml b/.github/workflows/linux_server_build.yml index 2120666c5a..5f9a27dcd0 100644 --- a/.github/workflows/linux_server_build.yml +++ b/.github/workflows/linux_server_build.yml @@ -33,7 +33,7 @@ jobs: - os: debian-11 image: docker.io/overte/overte-server-build:0.1.6-debian-11-amd64 arch: amd64 - conan_qt: False + qt_source: system # https://github.com/testflows/TestFlows-GitHub-Hetzner-Runners/wiki/Meta-Labels # self_hosted makes the Hetzner auto-scaler put up the job. # type-cx52 is a Hetzner VPS server type. In this case cs52 is a server with 16-cores and 32GB of RAM. @@ -44,41 +44,44 @@ jobs: - os: debian-11 image: docker.io/overte/overte-server-build:0.1.6-debian-11-aarch64 arch: aarch64 - conan_qt: False + qt_source: system runner: [self_hosted, type-cax41, image-arm-app-docker-ce] - os: debian-12 image: docker.io/overte/overte-server-build:0.1.6-debian-12-amd64 arch: amd64 - conan_qt: False + qt_source: system runner: [self_hosted, type-cpx41, image-x86-app-docker-ce] - os: debian-12 image: docker.io/overte/overte-server-build:0.1.6-debian-12-aarch64 arch: aarch64 - conan_qt: False + qt_source: system runner: [self_hosted, type-cax41, image-arm-app-docker-ce] - os: debian-13 image: docker.io/overte/overte-server-build:0.1.6-debian-13-amd64 arch: amd64 + qt_source: system runner: [self_hosted, type-cx52, image-x86-app-docker-ce] - os: debian-13 image: docker.io/overte/overte-server-build:0.1.6-debian-13-aarch64 arch: aarch64 + qt_source: system runner: [self_hosted, type-cax41, image-arm-app-docker-ce] - os: ubuntu-20.04 image: docker.io/overte/overte-server-build:0.1.6-ubuntu-20.04-amd64 arch: amd64 conan_qt: True + qt_source: source runner: [self_hosted, type-cpx41, image-x86-app-docker-ce] - os: ubuntu-22.04 image: docker.io/overte/overte-server-build:0.1.6-ubuntu-22.04-amd64 arch: amd64 - conan_qt: False + qt_source: system runner: [self_hosted, type-cpx41, image-x86-app-docker-ce] - os: ubuntu-22.04 @@ -90,35 +93,37 @@ jobs: - os: ubuntu-24.04 image: docker.io/overte/overte-server-build:0.1.6-ubuntu-24.04-amd64 arch: amd64 - conan_qt: False + qt_source: system runner: [self_hosted, type-cpx41, image-x86-app-docker-ce] - os: ubuntu-24.04 image: docker.io/overte/overte-server-build:0.1.6-ubuntu-24.04-aarch64 arch: aarch64 - conan_qt: False + qt_source: system runner: [self_hosted, type-cax41, image-arm-app-docker-ce] - os: fedora-40 image: docker.io/overte/overte-server-build:0.1.6-fedora-40-amd64 arch: amd64 - conan_qt: False + qt_source: system runner: [self_hosted, type-cpx41, image-x86-app-docker-ce] - os: fedora-40 image: docker.io/overte/overte-server-build:0.1.6-fedora-40-aarch64 arch: aarch64 - conan_qt: False + qt_source: system runner: [self_hosted, type-cax41, image-arm-app-docker-ce] - os: fedora-41 image: docker.io/overte/overte-server-build:0.1.6-fedora-41-amd64 arch: amd64 + qt_source: system runner: [self_hosted, type-cx52, image-x86-app-docker-ce] - os: fedora-41 image: docker.io/overte/overte-server-build:0.1.6-fedora-41-aarch64 arch: aarch64 + qt_source: system runner: [self_hosted, type-cax41, image-arm-app-docker-ce] #~ - os: fedora-42 @@ -134,7 +139,7 @@ jobs: - os: rockylinux-9 image: docker.io/overte/overte-server-build:0.1.6-rockylinux-9-amd64 arch: amd64 - conan_qt: False + qt_source: source runner: [self_hosted, type-cpx41, image-x86-app-docker-ce] fail-fast: false @@ -285,7 +290,7 @@ jobs: run: | # Run twice to work around OpenSSL not being found. See: https://github.com/overte-org/overte-conan-recipes/issues/1 for counter in {1..2}; do - conan install . -s compiler.cppstd=$CONAN_CPPSTD -s build_type=$BUILD_TYPE -o '&:with_qt='${CONAN_QT^} -b missing -pr:b=default -of build --format=json > build.json + conan install . -s compiler.cppstd=$CONAN_CPPSTD -s build_type=$BUILD_TYPE -o '&:qt_source='${qt_source} -b missing -pr:b=default -of build --format=json > build.json done - name: Configure CMake