Update linux_server_build.yml, master_build.yml, pr_build.yml, and 2 …

…more files
overte-org · Jan 23, 2025 · fe9321e · fe9321e
1 parent 53d2811
commit fe9321e
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 21 deletions.
diff --git 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.5-debian-11-amd64
             arch: amd64
-            conan_qt: false
+            conan_qt: False
             # 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,67 +44,67 @@ jobs:
           - os: debian-11
             image: docker.io/overte/overte-server-build:0.1.5-debian-11-aarch64
             arch: aarch64
-            conan_qt: false
+            conan_qt: False
             runner: [self_hosted, type-cax41, image-arm-app-docker-ce]
 
           - os: debian-12
             image: docker.io/overte/overte-server-build:0.1.5-debian-12-amd64
             arch: amd64
-            conan_qt: false
+            conan_qt: False
             runner: [self_hosted, type-cpx41, image-x86-app-docker-ce]
 
           - os: debian-12
             image: docker.io/overte/overte-server-build:0.1.5-debian-12-aarch64
             arch: aarch64
-            conan_qt: false
+            conan_qt: False
             runner: [self_hosted, type-cax41, image-arm-app-docker-ce]
 
           - os: ubuntu-20.04
             image: docker.io/overte/overte-server-build:0.1.5-ubuntu-20.04-amd64
             arch: amd64
-            conan_qt: true
+            conan_qt: True
             runner: [self_hosted, type-cpx41, image-x86-app-docker-ce]
 
           - os: ubuntu-22.04
             image: docker.io/overte/overte-server-build:0.1.5-ubuntu-22.04-amd64
             arch: amd64
-            conan_qt: false
+            conan_qt: False
             runner: [self_hosted, type-cpx41, image-x86-app-docker-ce]
 
           - os: ubuntu-22.04
             image: docker.io/overte/overte-server-build:0.1.5-ubuntu-22.04-aarch64
             arch: aarch64
-            conan_qt: false
+            conan_qt: False
             runner: [self_hosted, type-cax41, image-arm-app-docker-ce]
 
           - os: ubuntu-24.04
             image: docker.io/overte/overte-server-build:0.1.5-ubuntu-24.04-amd64
             arch: amd64
-            conan_qt: false
+            conan_qt: False
             runner: [self_hosted, type-cpx41, image-x86-app-docker-ce]
 
           - os: ubuntu-24.04
             image: docker.io/overte/overte-server-build:0.1.5-ubuntu-24.04-aarch64
             arch: aarch64
-            conan_qt: false
+            conan_qt: False
             runner: [self_hosted, type-cax41, image-arm-app-docker-ce]
 
           - os: fedora-40
             image: docker.io/overte/overte-server-build:0.1.5-fedora-40-amd64
             arch: amd64
-            conan_qt: false
+            conan_qt: False
             runner: [self_hosted, type-cpx41, image-x86-app-docker-ce]
 
           - os: fedora-40
             image: docker.io/overte/overte-server-build:0.1.5-fedora-40-aarch64
             arch: aarch64
-            conan_qt: false
+            conan_qt: False
             runner: [self_hosted, type-cax41, image-arm-app-docker-ce]
 
           - os: rockylinux-9
             image: docker.io/overte/overte-server-build:0.1.5-rockylinux-9-amd64
             arch: amd64
-            conan_qt: false
+            conan_qt: False
             runner: [self_hosted, type-cpx41, image-x86-app-docker-ce]
 
       fail-fast: false

diff --git a/.github/workflows/master_build.yml b/.github/workflows/master_build.yml
@@ -44,13 +44,13 @@ jobs:
         include:
           - os: windows-2019
             build_type: full
-            conan_qt: true
+            conan_qt: True
           #- os: macOS-10.15
           #  build_type: full
-          #  conan_qt: true
+          #  conan_qt: True
           #- os: ubuntu-20.04
           #  build_type: full
-          #  conan_qt: true
+          #  conan_qt: True
           #  apt-dependencies: mesa-common-dev libegl1 libglvnd-dev libdouble-conversion3 libpulse0 libsnappy1v5 libwebpdemux2 libwebpmux3 python3-github python3-distro
       fail-fast: false
     runs-on: ${{matrix.os}}

diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml
@@ -48,10 +48,10 @@ jobs:
               runner: windows-2019
               arch: x86_64
               build_type: full
-              conan_qt: true
+              conan_qt: True
             #- os: macOS-10.15
             #  build_type: full
-            #  conan_qt: true
+            #  conan_qt: True
             - os: Ubuntu 20.04
               # https://github.com/testflows/TestFlows-GitHub-Hetzner-Runners/wiki/Meta-Labels
               # self_hosted makes the Hetzner auto-scaler put up the job.
@@ -61,7 +61,7 @@ jobs:
               runner: [self_hosted, type-cpx41, image-x86-app-docker-ce]
               arch: amd64
               build_type: full
-              conan_qt: true
+              conan_qt: True
               # apt-dependencies:  # add missing dependencies to docker image when convenient
               image: docker.io/overte/overte-full-build:0.1.5-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
-              conan_qt: false
+              conan_qt: False
               # apt-dependencies:  # add missing dependencies to docker image when convenient
               image: docker.io/overte/overte-full-build:0.1.5-ubuntu-22.04-aarch64
         fail-fast: false

diff --git a/.github/workflows/release_build.yml b/.github/workflows/release_build.yml
@@ -37,7 +37,7 @@ jobs:
         include:
           - os: windows-2019
             build_type: full
-            conan_qt: true
+            conan_qt: True
       fail-fast: false
     runs-on: ${{matrix.os}}
     steps:

diff --git a/tools/ci-scripts/linux-ci/Dockerfile_build_ubuntu-22.04 b/tools/ci-scripts/linux-ci/Dockerfile_build_ubuntu-22.04
@@ -16,7 +16,7 @@ RUN apt-get update && apt-get -y install tzdata
 
 # Install Conan
 RUN apt-get -y install python3-pip
-RUN pip3 install --break-system-packages conan
+RUN pip3 install conan
 
 # Install Overte domain-server and assignment-client build dependencies
 RUN apt-get -y install curl ninja-build git cmake g++ libssl-dev libqt5websockets5-dev qtscript5-dev qtdeclarative5-dev qtmultimedia5-dev python3-distutils python3-distro mesa-common-dev libgl1-mesa-dev libsystemd-dev