From 3be0b9484df7bcbfeb1372d0849e01ef67040e0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Gro=C3=9F?= Date: Sat, 1 Mar 2025 14:07:19 +0100 Subject: [PATCH 1/7] Update CI container images to include python3-packaging. We already include the changes from the Conan pull request: Adding Conan and updating CMake and GCC for some images. --- .github/workflows/linux_server_build.yml | 26 +++++++++--------- .github/workflows/pr_build.yml | 10 +++---- .../deb_package/Dockerfile_build_debian-11 | 10 ++++--- .../deb_package/Dockerfile_build_debian-12 | 12 ++++++--- .../deb_package/Dockerfile_build_ubuntu-20.04 | 27 ++++++++++++++++--- .../deb_package/Dockerfile_build_ubuntu-22.04 | 27 ++++++++++++++++--- .../deb_package/Dockerfile_build_ubuntu-24.04 | 12 ++++++--- .../linux-ci/Dockerfile_build_ubuntu-20.04 | 27 ++++++++++++++++--- .../linux-ci/Dockerfile_build_ubuntu-22.04 | 27 ++++++++++++++++--- .../rpm_package/Dockerfile_build_fedora-40 | 11 +++++--- .../rpm_package/Dockerfile_build_rockylinux-9 | 11 +++++--- 11 files changed, 152 insertions(+), 48 deletions(-) diff --git a/.github/workflows/linux_server_build.yml b/.github/workflows/linux_server_build.yml index 084287c25b..9d1a35064e 100644 --- a/.github/workflows/linux_server_build.yml +++ b/.github/workflows/linux_server_build.yml @@ -1,6 +1,6 @@ # Copyright 2013-2019 High Fidelity, Inc. # Copyright 2020-2022 Vircadia contributors. -# Copyright 2021-2024 Overte e.V. +# Copyright 2021-2025 Overte e.V. # SPDX-License-Identifier: Apache-2.0 name: Linux Server CI Build @@ -33,7 +33,7 @@ jobs: matrix: include: - os: debian-11 - image: docker.io/overte/overte-server-build:0.1.3-debian-11-amd64 + image: docker.io/overte/overte-server-build:0.1.6-debian-11-amd64 arch: amd64 # https://github.com/testflows/TestFlows-GitHub-Hetzner-Runners/wiki/Meta-Labels # self_hosted makes the Hetzner auto-scaler put up the job. @@ -43,57 +43,57 @@ jobs: runner: [self_hosted, type-cx52, image-x86-app-docker-ce] - os: debian-11 - image: docker.io/overte/overte-server-build:0.1.3-debian-11-aarch64 + image: docker.io/overte/overte-server-build:0.1.6-debian-11-aarch64 arch: aarch64 runner: [self_hosted, type-cax41, image-arm-app-docker-ce] - os: debian-12 - image: docker.io/overte/overte-server-build:0.1.3-debian-12-amd64 + image: docker.io/overte/overte-server-build:0.1.6-debian-12-amd64 arch: amd64 runner: [self_hosted, type-cx52, image-x86-app-docker-ce] - os: debian-12 - image: docker.io/overte/overte-server-build:0.1.3-debian-12-aarch64 + image: docker.io/overte/overte-server-build:0.1.6-debian-12-aarch64 arch: aarch64 runner: [self_hosted, type-cax41, image-arm-app-docker-ce] - os: ubuntu-20.04 - image: docker.io/overte/overte-server-build:0.1.3-ubuntu-20.04-amd64 + image: docker.io/overte/overte-server-build:0.1.6-ubuntu-20.04-amd64 arch: amd64 runner: [self_hosted, type-cx52, image-x86-app-docker-ce] - os: ubuntu-22.04 - image: docker.io/overte/overte-server-build:0.1.3-ubuntu-22.04-amd64 + image: docker.io/overte/overte-server-build:0.1.6-ubuntu-22.04-amd64 arch: amd64 runner: [self_hosted, type-cx52, image-x86-app-docker-ce] - os: ubuntu-22.04 - image: docker.io/overte/overte-server-build:0.1.3-ubuntu-22.04-aarch64 + image: docker.io/overte/overte-server-build:0.1.6-ubuntu-22.04-aarch64 arch: aarch64 runner: [self_hosted, type-cax41, image-arm-app-docker-ce] - os: ubuntu-24.04 - image: docker.io/overte/overte-server-build:0.1.3-ubuntu-24.04-amd64 + image: docker.io/overte/overte-server-build:0.1.6-ubuntu-24.04-amd64 arch: amd64 runner: [self_hosted, type-cx52, image-x86-app-docker-ce] - os: ubuntu-24.04 - image: docker.io/overte/overte-server-build:0.1.3-ubuntu-24.04-aarch64 + image: docker.io/overte/overte-server-build:0.1.6-ubuntu-24.04-aarch64 arch: aarch64 runner: [self_hosted, type-cax41, image-arm-app-docker-ce] - os: fedora-40 - image: docker.io/overte/overte-server-build:0.1.4-fedora-40-amd64 + image: docker.io/overte/overte-server-build:0.1.6-fedora-40-amd64 arch: amd64 runner: [self_hosted, type-cx52, image-x86-app-docker-ce] - os: fedora-40 - image: docker.io/overte/overte-server-build:0.1.4-fedora-40-aarch64 + image: docker.io/overte/overte-server-build:0.1.6-fedora-40-aarch64 arch: aarch64 runner: [self_hosted, type-cax41, image-arm-app-docker-ce] - os: rockylinux-9 - image: docker.io/overte/overte-server-build:0.1.3-rockylinux-9-amd64 + image: docker.io/overte/overte-server-build:0.1.6-rockylinux-9-amd64 arch: amd64 runner: [self_hosted, type-cx52, image-x86-app-docker-ce] diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml index 38ebd353f6..1494389521 100644 --- a/.github/workflows/pr_build.yml +++ b/.github/workflows/pr_build.yml @@ -1,6 +1,6 @@ # Copyright 2013-2019 High Fidelity, Inc. # Copyright 2020-2022 Vircadia contributors. -# Copyright 2021-2024 Overte e.V. +# Copyright 2021-2025 Overte e.V. # SPDX-License-Identifier: Apache-2.0 name: Pull Request CI Build @@ -64,8 +64,8 @@ jobs: runner: [self_hosted, type-cx52, image-x86-app-docker-ce] arch: amd64 build_type: full - apt-dependencies: python3-packaging # add missing dependencies to docker image when convenient - image: docker.io/overte/overte-full-build:0.1.2-ubuntu-20.04-amd64 + # apt-dependencies: # 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 #- os: ubuntu-18.04 # build_type: android @@ -75,8 +75,8 @@ jobs: runner: [self_hosted, type-cax41, image-arm-app-docker-ce] arch: aarch64 build_type: full - image: docker.io/overte/overte-full-build:0.1.2-ubuntu-22.04-aarch64 - apt-dependencies: python3-packaging + image: docker.io/overte/overte-full-build:0.1.6-ubuntu-22.04-aarch64 + # apt-dependencies: # add missing dependencies to docker image when convenient fail-fast: false runs-on: ${{matrix.runner}} container: ${{matrix.image}} diff --git a/tools/ci-scripts/deb_package/Dockerfile_build_debian-11 b/tools/ci-scripts/deb_package/Dockerfile_build_debian-11 index 5abc8c9287..2680bce7f6 100644 --- a/tools/ci-scripts/deb_package/Dockerfile_build_debian-11 +++ b/tools/ci-scripts/deb_package/Dockerfile_build_debian-11 @@ -1,8 +1,8 @@ -# Copyright 2022-2023 Overte e.V. +# Copyright 2022-2025 Overte e.V. # SPDX-License-Identifier: Apache-2.0 # Docker file for building Overte Server -# Example build: docker build -t overte/overte-server-build:0.1.3-debian-11 -f Dockerfile_build_debian-11 . +# Example build: docker build -t overte/overte-server-build:0.1.6-debian-11 -f Dockerfile_build_debian-11 . FROM debian:bullseye LABEL maintainer="Julian Groß (julian.gro@overte.org)" LABEL description="Development image for Overte Domain server and assignment clients." @@ -14,8 +14,12 @@ RUN echo UTC >/etc/timezone # Installing via dependency causes interactive hang: RUN apt-get update && apt-get -y install tzdata +# Install Conan +RUN apt-get -y install python3-pip +RUN pip3 install conan + # Install Overte domain-server and assignment-client build dependencies -RUN apt-get -y install curl ninja-build git g++ libssl-dev libqt5websockets5-dev qtdeclarative5-dev qtmultimedia5-dev python3-distutils python3-distro mesa-common-dev libgl1-mesa-dev libsystemd-dev +RUN apt-get -y install curl ninja-build git g++ libssl-dev libqt5websockets5-dev qtdeclarative5-dev qtmultimedia5-dev python3-distutils python3-distro mesa-common-dev libgl1-mesa-dev libsystemd-dev python3-packaging # Install CMake from Debian Backports RUN echo deb http://deb.debian.org/debian bullseye-backports main > /etc/apt/sources.list.d/bullseye-backports.list diff --git a/tools/ci-scripts/deb_package/Dockerfile_build_debian-12 b/tools/ci-scripts/deb_package/Dockerfile_build_debian-12 index c634077170..7b7a016a2d 100644 --- a/tools/ci-scripts/deb_package/Dockerfile_build_debian-12 +++ b/tools/ci-scripts/deb_package/Dockerfile_build_debian-12 @@ -1,8 +1,8 @@ -# Copyright 2022-2023 Overte e.V. +# Copyright 2022-2025 Overte e.V. # SPDX-License-Identifier: Apache-2.0 # Docker file for building Overte Server -# Example build: docker build -t overte/overte-server-build:0.1.3-debian-12 -f Dockerfile_build_debian-12 . +# Example build: docker build -t overte/overte-server-build:0.1.6-debian-12 -f Dockerfile_build_debian-12 . FROM debian:bookworm LABEL maintainer="Julian Groß (julian.gro@overte.org)" LABEL description="Development image for Overte Domain server and assignment clients." @@ -14,8 +14,12 @@ RUN echo UTC >/etc/timezone # Installing via dependency causes interactive hang: 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 + # Install Overte domain-server and assignment-client build dependencies -RUN apt-get -y install cmake curl ninja-build git g++ libssl-dev libqt5websockets5-dev qtdeclarative5-dev qtmultimedia5-dev python3-distutils python3-distro mesa-common-dev libgl1-mesa-dev libsystemd-dev +RUN apt-get -y install cmake curl ninja-build git g++ libssl-dev libqt5websockets5-dev qtdeclarative5-dev qtmultimedia5-dev python3-distutils python3-distro mesa-common-dev libgl1-mesa-dev libsystemd-dev python3-packaging # Install Overte tools build dependencies RUN apt-get -y install libqt5webchannel5-dev qtwebengine5-dev libqt5xmlpatterns5-dev @@ -36,4 +40,4 @@ RUN echo "export LANG=en_US.UTF-8" >> ~/.bashrc RUN echo "export LANGUAGE=en_US.UTF-8" >> ~/.bashrc # Install tools needed for our Github Actions Workflow -Run apt-get -y install python3-boto3 python3-github zip +RUN apt-get -y install python3-boto3 python3-github zip diff --git a/tools/ci-scripts/deb_package/Dockerfile_build_ubuntu-20.04 b/tools/ci-scripts/deb_package/Dockerfile_build_ubuntu-20.04 index dbcb69a581..49d326316c 100644 --- a/tools/ci-scripts/deb_package/Dockerfile_build_ubuntu-20.04 +++ b/tools/ci-scripts/deb_package/Dockerfile_build_ubuntu-20.04 @@ -1,8 +1,8 @@ -# Copyright 2022-2023 Overte e.V. +# Copyright 2022-2025 Overte e.V. # SPDX-License-Identifier: Apache-2.0 # Docker file for building Overte Server -# Example build: docker build -t overte/overte-server-build:0.1.3-ubuntu-20.04 -f Dockerfile_build_ubuntu-20.04 . +# Example build: docker build -t overte/overte-server-build:0.1.6-ubuntu-20.04 -f Dockerfile_build_ubuntu-20.04 . FROM ubuntu:20.04 LABEL maintainer="Julian Groß (julian.gro@overte.org)" LABEL description="Development image for Overte Domain server and assignment clients." @@ -14,8 +14,29 @@ RUN echo UTC >/etc/timezone # Installing via dependency causes interactive hang: RUN apt-get update && apt-get -y install tzdata +# Install Conan +RUN apt-get -y install python3-pip +RUN pip3 install conan + +# Install CMake from Kitware +RUN apt-get update +RUN apt-get -y install ca-certificates gpg wget +RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null +RUN echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ focal main' | tee /etc/apt/sources.list.d/kitware.list >/dev/null +RUN apt-get update +RUN rm /usr/share/keyrings/kitware-archive-keyring.gpg && apt-get -y install kitware-archive-keyring +RUN apt-get -y install cmake + +# Install GCC 13 from Toolchain test PPA +RUN apt-get -y install software-properties-common +RUN add-apt-repository ppa:ubuntu-toolchain-r/test +RUN apt-get update +RUN apt-get -y install gcc-13 g++-13 +# Set GCC 13 as default +RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 100 --slave /usr/bin/g++ g++ /usr/bin/g++-13 --slave /usr/bin/gcov gcov /usr/bin/gcov-13 + # Install Overte domain-server and assignment-client build dependencies -RUN apt-get -y install curl ninja-build git cmake g++ libssl-dev python3-distutils python3-distro mesa-common-dev libgl1-mesa-dev libharfbuzz-dev libdouble-conversion3 libxext-dev libsystemd-dev +RUN apt-get -y install curl ninja-build git cmake g++ libssl-dev python3-distutils python3-distro mesa-common-dev libgl1-mesa-dev libharfbuzz-dev libdouble-conversion3 libxext-dev libsystemd-dev python3-packaging # Install tools for package creation RUN apt-get -y install sudo chrpath binutils dh-make diff --git a/tools/ci-scripts/deb_package/Dockerfile_build_ubuntu-22.04 b/tools/ci-scripts/deb_package/Dockerfile_build_ubuntu-22.04 index 403baa5aef..9e659af7d7 100644 --- a/tools/ci-scripts/deb_package/Dockerfile_build_ubuntu-22.04 +++ b/tools/ci-scripts/deb_package/Dockerfile_build_ubuntu-22.04 @@ -1,8 +1,8 @@ -# Copyright 2022-2023 Overte e.V. +# Copyright 2022-2025 Overte e.V. # SPDX-License-Identifier: Apache-2.0 # Docker file for building Overte Server -# Example build: docker build -t overte/overte-server-build:0.1.3-ubuntu-22.04 -f Dockerfile_build_ubuntu-22.04 . +# Example build: docker build -t overte/overte-server-build:0.1.6-ubuntu-22.04 -f Dockerfile_build_ubuntu-22.04 . FROM ubuntu:22.04 LABEL maintainer="Julian Groß (julian.gro@overte.org)" LABEL description="Development image for Overte Domain server and assignment clients." @@ -14,8 +14,29 @@ RUN echo UTC >/etc/timezone # Installing via dependency causes interactive hang: RUN apt-get update && apt-get -y install tzdata +# Install Conan +RUN apt-get -y install python3-pip +RUN pip3 install conan + +# Install CMake from Kitware +RUN apt-get update +RUN apt-get -y install ca-certificates gpg wget +RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null +RUN echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ jammy main' | tee /etc/apt/sources.list.d/kitware.list >/dev/null +RUN apt-get update +RUN rm /usr/share/keyrings/kitware-archive-keyring.gpg && apt-get -y install kitware-archive-keyring +RUN apt-get -y install cmake + +# Install GCC 13 from Toolchain test PPA +RUN apt-get -y install software-properties-common +RUN add-apt-repository ppa:ubuntu-toolchain-r/test +RUN apt-get update +RUN apt-get -y install gcc-13 g++-13 +# Set GCC 13 as default +RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 100 --slave /usr/bin/g++ g++ /usr/bin/g++-13 --slave /usr/bin/gcov gcov /usr/bin/gcov-13 + # Install Overte domain-server and assignment-client build dependencies -RUN apt-get -y install curl ninja-build git cmake g++ libssl-dev libqt5websockets5-dev qtdeclarative5-dev qtmultimedia5-dev python3-distutils python3-distro mesa-common-dev libgl1-mesa-dev libsystemd-dev +RUN apt-get -y install curl ninja-build git cmake g++ libssl-dev libqt5websockets5-dev qtdeclarative5-dev qtmultimedia5-dev python3-distutils python3-distro mesa-common-dev libgl1-mesa-dev libsystemd-dev python3-packaging # Install Overte tools build dependencies RUN apt-get -y install libqt5webchannel5-dev qtwebengine5-dev libqt5xmlpatterns5-dev diff --git a/tools/ci-scripts/deb_package/Dockerfile_build_ubuntu-24.04 b/tools/ci-scripts/deb_package/Dockerfile_build_ubuntu-24.04 index 05274ae303..ee6ec34245 100644 --- a/tools/ci-scripts/deb_package/Dockerfile_build_ubuntu-24.04 +++ b/tools/ci-scripts/deb_package/Dockerfile_build_ubuntu-24.04 @@ -1,8 +1,8 @@ -# Copyright 2022-2024 Overte e.V. +# Copyright 2022-2025 Overte e.V. # SPDX-License-Identifier: Apache-2.0 # Docker file for building Overte Server -# Example build: docker build -t overte/overte-server-build:0.1.3-ubuntu-24.04 -f Dockerfile_build_ubuntu-24.04 . +# Example build: docker build -t overte/overte-server-build:0.1.6-ubuntu-24.04 -f Dockerfile_build_ubuntu-24.04 . FROM ubuntu:24.04 LABEL maintainer="Julian Groß (julian.gro@overte.org)" LABEL description="Development image for Overte Domain server and assignment clients." @@ -14,8 +14,12 @@ RUN echo UTC >/etc/timezone # Installing via dependency causes interactive hang: 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 + # Install Overte domain-server and assignment-client build dependencies -RUN apt-get -y install curl ninja-build git cmake g++ libssl-dev libqt5websockets5-dev qtdeclarative5-dev qtmultimedia5-dev python3-setuptools python3-distro mesa-common-dev libgl1-mesa-dev libsystemd-dev +RUN apt-get -y install curl ninja-build git cmake g++ libssl-dev libqt5websockets5-dev qtdeclarative5-dev qtmultimedia5-dev python3-setuptools python3-distro mesa-common-dev libgl1-mesa-dev libsystemd-dev python3-packaging # Install Overte tools build dependencies RUN apt-get -y install libqt5webchannel5-dev qtwebengine5-dev libqt5xmlpatterns5-dev @@ -35,4 +39,4 @@ RUN echo "export LANG=en_US.UTF-8" >> ~/.bashrc RUN echo "export LANGUAGE=en_US.UTF-8" >> ~/.bashrc # Install tools needed for our Github Actions Workflow -Run apt-get -y install python3-boto3 python3-github zip +RUN apt-get -y install python3-boto3 python3-github zip diff --git a/tools/ci-scripts/linux-ci/Dockerfile_build_ubuntu-20.04 b/tools/ci-scripts/linux-ci/Dockerfile_build_ubuntu-20.04 index eb26d1b426..1f8e331629 100644 --- a/tools/ci-scripts/linux-ci/Dockerfile_build_ubuntu-20.04 +++ b/tools/ci-scripts/linux-ci/Dockerfile_build_ubuntu-20.04 @@ -1,8 +1,8 @@ -# Copyright 2022-2024 Overte e.V. +# Copyright 2022-2025 Overte e.V. # SPDX-License-Identifier: Apache-2.0 # Docker file for building Overte -# Example build: docker build -t overte/overte-full-build:0.1.2-ubuntu-20.04 -f Dockerfile_build_ubuntu-20.04 . +# Example build: docker build -t overte/overte-full-build:0.1.6-ubuntu-20.04 -f Dockerfile_build_ubuntu-20.04 . FROM ubuntu:20.04 LABEL maintainer="Julian Groß (julian.gro@overte.org)" LABEL description="Development image for full Overte builds" @@ -14,12 +14,33 @@ RUN echo UTC >/etc/timezone # Installing via dependency causes interactive hang: RUN apt-get update && apt-get -y install tzdata +# Install Conan +RUN apt-get -y install python3-pip +RUN pip3 install conan + +# Install CMake from Kitware +RUN apt-get update +RUN apt-get -y install ca-certificates gpg wget +RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null +RUN echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ focal main' | tee /etc/apt/sources.list.d/kitware.list >/dev/null +RUN apt-get update +RUN rm /usr/share/keyrings/kitware-archive-keyring.gpg && apt-get -y install kitware-archive-keyring +RUN apt-get -y install cmake + +# Install GCC 13 from Toolchain test PPA +RUN apt-get -y install software-properties-common +RUN add-apt-repository ppa:ubuntu-toolchain-r/test +RUN apt-get update +RUN apt-get -y install gcc-13 g++-13 +# Set GCC 13 as default +RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 100 --slave /usr/bin/g++ g++ /usr/bin/g++-13 --slave /usr/bin/gcov gcov /usr/bin/gcov-13 + # Install Overte domain-server and assignment-client build dependencies RUN apt-get -y install curl ninja-build git cmake g++ libssl-dev python3-distutils python3-distro mesa-common-dev libgl1-mesa-dev libsystemd-dev # Install server-console build dependencies RUN apt-get -y install npm # Install Interface dependencies -RUN apt-get -y install pkg-config libxext-dev libdouble-conversion-dev libpcre2-16-0 libpulse0 libharfbuzz-dev libnss3 libnspr4 libxdamage1 libasound2 vulkan-validationlayers libvulkan-dev libvulkan1 +RUN apt-get -y install pkg-config libxext-dev libdouble-conversion-dev libpcre2-16-0 libpulse0 libharfbuzz-dev libnss3 libnspr4 libxdamage1 libasound2 vulkan-validationlayers libvulkan-dev libvulkan1 python3-packaging # Install tools for package creation RUN apt-get -y install sudo chrpath binutils dh-make diff --git a/tools/ci-scripts/linux-ci/Dockerfile_build_ubuntu-22.04 b/tools/ci-scripts/linux-ci/Dockerfile_build_ubuntu-22.04 index a4da419e87..6b42eb1c18 100644 --- a/tools/ci-scripts/linux-ci/Dockerfile_build_ubuntu-22.04 +++ b/tools/ci-scripts/linux-ci/Dockerfile_build_ubuntu-22.04 @@ -1,8 +1,8 @@ -# Copyright 2022-2024 Overte e.V. +# Copyright 2022-2025 Overte e.V. # SPDX-License-Identifier: Apache-2.0 # Docker file for building Overte -# Example build: docker build -t overte/overte-full-build:0.1.2-ubuntu-22.04 -f Dockerfile_build_ubuntu-22.04 . +# Example build: docker build -t overte/overte-full-build:0.1.6-ubuntu-22.04 -f Dockerfile_build_ubuntu-22.04 . FROM ubuntu:22.04 LABEL maintainer="Julian Groß (julian.gro@overte.org)" LABEL description="Development image for full Overte builds" @@ -14,8 +14,29 @@ RUN echo UTC >/etc/timezone # Installing via dependency causes interactive hang: RUN apt-get update && apt-get -y install tzdata +# Install Conan +RUN apt-get -y install python3-pip +RUN pip3 install conan + +# Install CMake from Kitware +RUN apt-get update +RUN apt-get -y install ca-certificates gpg wget +RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null +RUN echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ jammy main' | tee /etc/apt/sources.list.d/kitware.list >/dev/null +RUN apt-get update +RUN rm /usr/share/keyrings/kitware-archive-keyring.gpg && apt-get -y install kitware-archive-keyring +RUN apt-get -y install cmake + +# Install GCC 13 from Toolchain test PPA +RUN apt-get -y install software-properties-common +RUN add-apt-repository ppa:ubuntu-toolchain-r/test +RUN apt-get update +RUN apt-get -y install gcc-13 g++-13 +# Set GCC 13 as default +RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 100 --slave /usr/bin/g++ g++ /usr/bin/g++-13 --slave /usr/bin/gcov gcov /usr/bin/gcov-13 + # 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 +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 python3-packaging # Install Overte tools build dependencies RUN apt-get -y install libqt5webchannel5-dev qtwebengine5-dev libqt5xmlpatterns5-dev # Install Overte Interface build dependencies diff --git a/tools/ci-scripts/rpm_package/Dockerfile_build_fedora-40 b/tools/ci-scripts/rpm_package/Dockerfile_build_fedora-40 index d9a9d994c3..15e9bc81cc 100644 --- a/tools/ci-scripts/rpm_package/Dockerfile_build_fedora-40 +++ b/tools/ci-scripts/rpm_package/Dockerfile_build_fedora-40 @@ -1,14 +1,14 @@ -# Copyright 2022-2024 Overte e.V. +# Copyright 2022-2025 Overte e.V. # SPDX-License-Identifier: Apache-2.0 # Docker file for building Overte Server -# Example build: docker build -t overte/overte-server-build:0.1.4-fedora-40 -f Dockerfile_build_fedora-40 . +# Example build: docker build -t overte/overte-server-build:0.1.6-fedora-40 -f Dockerfile_build_fedora-40 . FROM fedora:40 LABEL maintainer="Julian Groß (julian.gro@overte.org)" LABEL description="Development image for Overte Domain server and assignment clients." # Install Overte domain-server and assignment-client build dependencies -RUN dnf -y install curl ninja-build git cmake gcc gcc-c++ openssl-devel qt5-qtwebsockets-devel qt5-qtmultimedia-devel unzip libXext-devel qt5-qtwebchannel-devel qt5-qtwebengine-devel qt5-qtxmlpatterns-devel systemd-devel python3 +RUN dnf -y install curl ninja-build git cmake gcc gcc-c++ openssl-devel qt5-qtwebsockets-devel qt5-qtmultimedia-devel unzip libXext-devel qt5-qtwebchannel-devel qt5-qtwebengine-devel qt5-qtxmlpatterns-devel systemd-devel python3 python3-packaging # Install additional build tools RUN dnf -y install zip unzip @@ -17,4 +17,7 @@ RUN dnf -y install zip unzip RUN dnf -y install chrpath rpmdevtools # Install tools needed for our Github Actions Workflow -Run dnf -y install python3-boto3 python3-pygithub +RUN dnf -y install python3-boto3 python3-pygithub + +# Install Conan +RUN dnf -y install conan diff --git a/tools/ci-scripts/rpm_package/Dockerfile_build_rockylinux-9 b/tools/ci-scripts/rpm_package/Dockerfile_build_rockylinux-9 index cc03288fb7..0650abfbb1 100644 --- a/tools/ci-scripts/rpm_package/Dockerfile_build_rockylinux-9 +++ b/tools/ci-scripts/rpm_package/Dockerfile_build_rockylinux-9 @@ -1,8 +1,8 @@ -# Copyright 2022-2023 Overte e.V. +# Copyright 2022-2025 Overte e.V. # SPDX-License-Identifier: Apache-2.0 # Docker file for building Overte Server -# Example build: docker build -t overte/overte-server-build:0.1.3-rockylinux-9 -f Dockerfile_build_rockylinux-9 . +# Example build: docker build -t overte/overte-server-build:0.1.6-rockylinux-9 -f Dockerfile_build_rockylinux-9 . FROM rockylinux:9 LABEL maintainer="Julian Groß (julian.gro@overte.org)" LABEL description="Development image for Overte Domain server and assignment clients." @@ -16,7 +16,8 @@ RUN dnf -y install epel-release RUN dnf config-manager --enable crb # Install Overte domain-server and assignment-client build dependencies -RUN dnf -y install curl ninja-build git cmake gcc-c++ openssl-devel qt5-qtwebsockets-devel qt5-qtmultimedia-devel unzip libXext-devel qt5-qtwebchannel-devel qt5-qtwebengine-devel qt5-qtxmlpatterns-devel systemd-devel +# Work around an issue with aarch64 shipping curl-minimal and us requesting curl by allowing dnf to use erase curl-minimal. +RUN dnf -y --allowerasing install curl ninja-build git cmake gcc-c++ openssl-devel qt5-qtwebsockets-devel qt5-qtmultimedia-devel unzip libXext-devel qt5-qtwebchannel-devel qt5-qtwebengine-devel qt5-qtxmlpatterns-devel systemd-devel python3-packaging # Install additional build tools RUN dnf -y install zip unzip @@ -26,3 +27,7 @@ RUN dnf -y install chrpath rpmdevtools # Install tools needed for our Github Actions Workflow Run dnf -y install python3-boto3 python3-github + +# Install Conan +RUN dnf -y install python3-pip +RUN pip3 install conan From ddbddab1e0e960daa0e6f82e71b19fd57d8e71aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Gro=C3=9F?= Date: Sat, 1 Mar 2025 14:08:27 +0100 Subject: [PATCH 2/7] Add Debian 13, Fedora 41 and Fedora 42 to CI server build pipeline. --- .github/workflows/linux_server_build.yml | 34 +++++++++++++++ .../deb_package/Dockerfile_build_debian-13 | 43 +++++++++++++++++++ .../rpm_package/Dockerfile_build_fedora-41 | 23 ++++++++++ .../rpm_package/Dockerfile_build_fedora-42 | 23 ++++++++++ 4 files changed, 123 insertions(+) create mode 100644 tools/ci-scripts/deb_package/Dockerfile_build_debian-13 create mode 100644 tools/ci-scripts/rpm_package/Dockerfile_build_fedora-41 create mode 100644 tools/ci-scripts/rpm_package/Dockerfile_build_fedora-42 diff --git a/.github/workflows/linux_server_build.yml b/.github/workflows/linux_server_build.yml index 9d1a35064e..13515da152 100644 --- a/.github/workflows/linux_server_build.yml +++ b/.github/workflows/linux_server_build.yml @@ -57,6 +57,16 @@ jobs: arch: aarch64 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 + 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 + 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 @@ -92,6 +102,26 @@ jobs: arch: aarch64 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 + 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 + runner: [self_hosted, type-cax41, image-arm-app-docker-ce] + + - os: fedora-42 + image: docker.io/overte/overte-server-build:0.1.6-fedora-42-amd64 + arch: amd64 + runner: [self_hosted, type-cx52, image-x86-app-docker-ce] + + - os: fedora-42 + image: docker.io/overte/overte-server-build:0.1.6-fedora-42-aarch64 + arch: aarch64 + runner: [self_hosted, type-cax41, image-arm-app-docker-ce] + - os: rockylinux-9 image: docker.io/overte/overte-server-build:0.1.6-rockylinux-9-amd64 arch: amd64 @@ -216,6 +246,10 @@ jobs: echo "ARTIFACT_PATTERN=overte-server-$RPMVERSION-1.el9.$INSTALLER_EXT" >> $GITHUB_ENV elif [ "${{ matrix.os }}" == "fedora-40" ]; then echo "ARTIFACT_PATTERN=overte-server-$RPMVERSION-1.fc40.$INSTALLER_EXT" >> $GITHUB_ENV + elif [ "${{ matrix.os }}" == "fedora-41" ]; then + echo "ARTIFACT_PATTERN=overte-server-$RPMVERSION-1.fc41.$INSTALLER_EXT" >> $GITHUB_ENV + elif [ "${{ matrix.os }}" == "fedora-42" ]; then + echo "ARTIFACT_PATTERN=overte-server-$RPMVERSION-1.fc42.$INSTALLER_EXT" >> $GITHUB_ENV else echo "Error! ARTIFACT_PATTERN not set!" exit 1 # Fail diff --git a/tools/ci-scripts/deb_package/Dockerfile_build_debian-13 b/tools/ci-scripts/deb_package/Dockerfile_build_debian-13 new file mode 100644 index 0000000000..15cf6a5f79 --- /dev/null +++ b/tools/ci-scripts/deb_package/Dockerfile_build_debian-13 @@ -0,0 +1,43 @@ +# Copyright 2022-2025 Overte e.V. +# SPDX-License-Identifier: Apache-2.0 + +# Docker file for building Overte Server +# Example build: docker build -t overte/overte-server-build:0.1.6-debian-13 -f Dockerfile_build_debian-13 . +FROM debian:trixie +LABEL maintainer="Julian Groß (julian.gro@overte.org)" +LABEL description="Development image for Overte Domain server and assignment clients." + +# Don't use any frontend when installing packages during the creation of this container +ARG DEBIAN_FRONTEND=noninteractive + +RUN echo UTC >/etc/timezone +# Installing via dependency causes interactive hang: +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 + +# Install Overte domain-server and assignment-client build dependencies +RUN apt-get -y install cmake curl ninja-build git g++ libssl-dev libqt5websockets5-dev qtdeclarative5-dev qtmultimedia5-dev python3-distro mesa-common-dev libgl1-mesa-dev libsystemd-dev python3-packaging + +# Install Overte tools build dependencies +RUN apt-get -y install libqt5webchannel5-dev qtwebengine5-dev libqt5xmlpatterns5-dev + +# Install tools for package creation +RUN apt-get -y install sudo chrpath binutils dh-make + +# Install locales package +RUN apt-get -y install locales +# Uncomment en_US.UTF-8 for inclusion in generation +RUN sed -i 's/^# *\(en_US.UTF-8\)/\1/' /etc/locale.gen +# Generate locale +RUN locale-gen + +# Export env vars +RUN echo "export LC_ALL=en_US.UTF-8" >> ~/.bashrc +RUN echo "export LANG=en_US.UTF-8" >> ~/.bashrc +RUN echo "export LANGUAGE=en_US.UTF-8" >> ~/.bashrc + +# Install tools needed for our Github Actions Workflow +RUN apt-get -y install python3-boto3 python3-github zip diff --git a/tools/ci-scripts/rpm_package/Dockerfile_build_fedora-41 b/tools/ci-scripts/rpm_package/Dockerfile_build_fedora-41 new file mode 100644 index 0000000000..9492e34303 --- /dev/null +++ b/tools/ci-scripts/rpm_package/Dockerfile_build_fedora-41 @@ -0,0 +1,23 @@ +# Copyright 2022-2025 Overte e.V. +# SPDX-License-Identifier: Apache-2.0 + +# Docker file for building Overte Server +# Example build: docker build -t overte/overte-server-build:0.1.6-fedora-41 -f Dockerfile_build_fedora-41 . +FROM fedora:41 +LABEL maintainer="Julian Groß (julian.gro@overte.org)" +LABEL description="Development image for Overte Domain server and assignment clients." + +# Install Overte domain-server and assignment-client build dependencies +RUN dnf -y install curl ninja-build git cmake gcc gcc-c++ openssl-devel qt5-qtwebsockets-devel qt5-qtmultimedia-devel unzip libXext-devel qt5-qtwebchannel-devel qt5-qtwebengine-devel qt5-qtxmlpatterns-devel systemd-devel python3 python3-packaging + +# Install additional build tools +RUN dnf -y install zip unzip + +# Install tools for package creation +RUN dnf -y install chrpath rpmdevtools + +# Install tools needed for our Github Actions Workflow +Run dnf -y install python3-boto3 python3-pygithub + +# Install Conan +RUN dnf -y install conan diff --git a/tools/ci-scripts/rpm_package/Dockerfile_build_fedora-42 b/tools/ci-scripts/rpm_package/Dockerfile_build_fedora-42 new file mode 100644 index 0000000000..36d26dc624 --- /dev/null +++ b/tools/ci-scripts/rpm_package/Dockerfile_build_fedora-42 @@ -0,0 +1,23 @@ +# Copyright 2022-2025 Overte e.V. +# SPDX-License-Identifier: Apache-2.0 + +# Docker file for building Overte Server +# Example build: docker build -t overte/overte-server-build:0.1.6-fedora-42 -f Dockerfile_build_fedora-42 . +FROM fedora:42 +LABEL maintainer="Julian Groß (julian.gro@overte.org)" +LABEL description="Development image for Overte Domain server and assignment clients." + +# Install Overte domain-server and assignment-client build dependencies +RUN dnf -y install curl ninja-build git cmake gcc gcc-c++ openssl-devel qt5-qtwebsockets-devel qt5-qtmultimedia-devel unzip libXext-devel qt5-qtwebchannel-devel qt5-qtwebengine-devel qt5-qtxmlpatterns-devel systemd-devel python3 python3-packaging + +# Install additional build tools +RUN dnf -y install zip unzip + +# Install tools for package creation +RUN dnf -y install chrpath rpmdevtools + +# Install tools needed for our Github Actions Workflow +Run dnf -y install python3-boto3 python3-pygithub + +# Install Conan +RUN dnf -y install conan From bc6f8857fbb5c3a9a5187f69dd24a7c1b1a23fe1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Gro=C3=9F?= Date: Sat, 1 Mar 2025 14:12:12 +0100 Subject: [PATCH 3/7] Fix CMake errors; CMake removed version compatibility with CMake 3.5 and below. This includes bumping glslang, as it was still using CMake version compatibility <3.0. --- CMakeLists.txt | 11 +---------- cmake/ports/glslang/CONTROL | 2 +- cmake/ports/glslang/portfile.cmake | 4 ++-- tools/shadergen.py | 2 +- 4 files changed, 5 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index abe642a329..c5fb2acc31 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,17 +1,8 @@ # Copyright 2013-2019 High Fidelity, Inc. # Copyright 2019-2021 Vircadia contributors. -# Copyright 2020-2023 Overte e.V. +# Copyright 2020-2025 Overte e.V. # SPDX-License-Identifier: Apache-2.0 -# If we're running under the gradle build, HIFI_ANDROID will be set here, but -# ANDROID will not be set until after the `project` statement. This is the *ONLY* -# place you need to use `HIFI_ANDROID` instead of `ANDROID` -if (WIN32 AND NOT HIFI_ANDROID) - cmake_minimum_required(VERSION 3.7) -else() - cmake_minimum_required(VERSION 3.2) -endif() - # 3.14 is the minimum version that supports symlinks on Windows cmake_minimum_required(VERSION 3.14) diff --git a/cmake/ports/glslang/CONTROL b/cmake/ports/glslang/CONTROL index 74a2530e4c..026b3e9926 100644 --- a/cmake/ports/glslang/CONTROL +++ b/cmake/ports/glslang/CONTROL @@ -1,3 +1,3 @@ Source: glslang -Version: untagged-048c4dbc7f021224a933-1 +Version: 11.13.0 Description: Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator diff --git a/cmake/ports/glslang/portfile.cmake b/cmake/ports/glslang/portfile.cmake index 6a5fe2b5bf..47e0105ec9 100644 --- a/cmake/ports/glslang/portfile.cmake +++ b/cmake/ports/glslang/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/glslang - REF untagged-048c4dbc7f021224a933 - SHA512 e3097dd2db88320982d7da1ddce138839daf3251935909c3998a114aeadd408760b26b2d7c7ee547fb0519895ac1853a45c23df2eecf61135849b080252e9dec + REF 11.13.0 + SHA512 20c2a6543b002648f459f26bd36b5c445afd6d8eae175e400dbe45632f11ca8de1f9e6f6e98fd6f910aa75d90063e174c095e7df26d9d4982192b84d08b0dc8b HEAD_REF master ) diff --git a/tools/shadergen.py b/tools/shadergen.py index 1f4acae915..e74557ddd6 100644 --- a/tools/shadergen.py +++ b/tools/shadergen.py @@ -217,7 +217,7 @@ def processCommand(line): executeSubprocess(scribeArgs) # Generate the un-optimized output - executeSubprocess([glslangExec, '-V110', '-o', upoptSpirvFile, unoptGlslFile]) + executeSubprocess([glslangExec, '-V100', '-o', upoptSpirvFile, unoptGlslFile]) # Optimize the SPIRV executeSubprocess([spirvOptExec, '-O', '-o', spirvFile, upoptSpirvFile]) From cea1a9526d4c62b7a7eded9480261cc1c7cb4fc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Gro=C3=9F?= Date: Sat, 1 Mar 2025 14:13:27 +0100 Subject: [PATCH 4/7] Update libnode for Python 3.13 compatibility. --- cmake/ports/node/CONTROL | 4 +- cmake/ports/node/portfile.cmake | 9 ++-- cmake/ports/node/replace-distutils.patch | 50 ----------------------- cmake/ports/node/replace-distutils2.patch | 21 ---------- 4 files changed, 6 insertions(+), 78 deletions(-) delete mode 100644 cmake/ports/node/replace-distutils.patch delete mode 100644 cmake/ports/node/replace-distutils2.patch diff --git a/cmake/ports/node/CONTROL b/cmake/ports/node/CONTROL index fa5ca5af7b..b3a3b18e3e 100644 --- a/cmake/ports/node/CONTROL +++ b/cmake/ports/node/CONTROL @@ -1,6 +1,6 @@ -# Copyright 2023 Overte e.V. +# Copyright 2023-2025 Overte e.V. # SPDX-License-Identifier: MIT Source: node -Version: 18.14.2-1 +Version: 18.20.7 Homepage: https://nodejs.org/ Description: Node.js JavaScript runtime. diff --git a/cmake/ports/node/portfile.cmake b/cmake/ports/node/portfile.cmake index f9d76a124c..ace8c22d45 100644 --- a/cmake/ports/node/portfile.cmake +++ b/cmake/ports/node/portfile.cmake @@ -1,4 +1,4 @@ -# Copyright 2023-2024 Overte e.V. +# Copyright 2023-2025 Overte e.V. # SPDX-License-Identifier: Apache-2.0 set(NODE_VERSION 18.14.2) @@ -28,10 +28,9 @@ else () vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nodejs/node - REF v18.20.2 - SHA512 10d3637c26274677d137f76bbb648d0e7851c994634a16c89858c3a13094a0692ea2cb9a787c6463c3001abd71dab0d83123127bc305171d097c48d21d691678 - HEAD_REF v18.20.2 - PATCHES replace-distutils.patch replace-distutils2.patch + REF v18.20.7 + SHA512 0d7000937b9b5089affc23daa7222938213bd5d77b8ed872d8cb424570fbc3e1567362c18ee8ef99413be098f7ff9fb82d49b9fc92fc93589628b07d1464b3ff + HEAD_REF v18.20.7 ) # node cannot configure out of source, which VCPKG expects. So we copy the source to the configure directory. file(COPY ${SOURCE_PATH}/ DESTINATION "${CURRENT_BUILDTREES_DIR}") diff --git a/cmake/ports/node/replace-distutils.patch b/cmake/ports/node/replace-distutils.patch deleted file mode 100644 index 4e48bea186..0000000000 --- a/cmake/ports/node/replace-distutils.patch +++ /dev/null @@ -1,50 +0,0 @@ -commit 95534ad82f4e33f53fd50efe633d43f8da70cba6 -Author: Luigi Pinca -Date: Wed Nov 8 21:20:53 2023 +0100 - - build: fix build with Python 3.12 - - Replace `distutils.version.StrictVersion` with - `packaging.version.Version`. - - Refs: https://github.com/nodejs/node/pull/50209#issuecomment-1795852539 - PR-URL: https://github.com/nodejs/node/pull/50582 - Reviewed-By: Richard Lau - Reviewed-By: Chengzhong Wu - -diff --git a/configure.py b/configure.py -index 33671a0342..be95decd56 100755 ---- a/configure.py -+++ b/configure.py -@@ -14,8 +14,6 @@ import bz2 - import io - from pathlib import Path - --from distutils.version import StrictVersion -- - # If not run from node/, cd to node/. - os.chdir(Path(__file__).parent) - -@@ -30,6 +28,7 @@ tools_path = Path('tools') - - sys.path.insert(0, str(tools_path / 'gyp' / 'pylib')) - from gyp.common import GetFlavor -+from packaging.version import Version - - # imports in tools/configure.d - sys.path.insert(0, str(tools_path / 'configure.d')) -@@ -1566,10 +1565,10 @@ def configure_openssl(o): - # supported asm compiler for AVX2. See https://github.com/openssl/openssl/ - # blob/OpenSSL_1_1_0-stable/crypto/modes/asm/aesni-gcm-x86_64.pl#L52-L69 - openssl110_asm_supported = \ -- ('gas_version' in variables and StrictVersion(variables['gas_version']) >= StrictVersion('2.23')) or \ -- ('xcode_version' in variables and StrictVersion(variables['xcode_version']) >= StrictVersion('5.0')) or \ -- ('llvm_version' in variables and StrictVersion(variables['llvm_version']) >= StrictVersion('3.3')) or \ -- ('nasm_version' in variables and StrictVersion(variables['nasm_version']) >= StrictVersion('2.10')) -+ ('gas_version' in variables and Version(variables['gas_version']) >= Version('2.23')) or \ -+ ('xcode_version' in variables and Version(variables['xcode_version']) >= Version('5.0')) or \ -+ ('llvm_version' in variables and Version(variables['llvm_version']) >= Version('3.3')) or \ -+ ('nasm_version' in variables and Version(variables['nasm_version']) >= Version('2.10')) - - if is_x86 and not openssl110_asm_supported: - error('''Did not find a new enough assembler, install one or build with diff --git a/cmake/ports/node/replace-distutils2.patch b/cmake/ports/node/replace-distutils2.patch deleted file mode 100644 index 14d10d6b99..0000000000 --- a/cmake/ports/node/replace-distutils2.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ru node/tools/gyp/pylib/gyp/input.py node.patched/tools/gyp/pylib/gyp/input.py ---- node/tools/gyp/pylib/gyp/input.py 2024-04-10 14:12:07.000000000 +0200 -+++ node.patched/tools/gyp/pylib/gyp/input.py 2025-02-27 21:58:01.579193906 +0100 -@@ -16,7 +16,7 @@ - import sys - import threading - import traceback --from distutils.version import StrictVersion -+from packaging.version import Version - from gyp.common import GypError - from gyp.common import OrderedSet - -@@ -1190,7 +1190,7 @@ - else: - ast_code = compile(cond_expr_expanded, "", "eval") - cached_conditions_asts[cond_expr_expanded] = ast_code -- env = {"__builtins__": {}, "v": StrictVersion} -+ env = {"__builtins__": {}, "v": Version} - if eval(ast_code, env, variables): - return true_dict - return false_dict From b6ad7273eb7221d6b64ed0f1af3974236e23848e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Gro=C3=9F?= Date: Sat, 1 Mar 2025 14:15:01 +0100 Subject: [PATCH 5/7] Patch glslang for GCC 13 compatiblity. --- ...1-Include-cstdint-header-in-Common.h.patch | 60 +++++++++++++++++++ cmake/ports/glslang/portfile.cmake | 1 + 2 files changed, 61 insertions(+) create mode 100644 cmake/ports/glslang/0001-Include-cstdint-header-in-Common.h.patch diff --git a/cmake/ports/glslang/0001-Include-cstdint-header-in-Common.h.patch b/cmake/ports/glslang/0001-Include-cstdint-header-in-Common.h.patch new file mode 100644 index 0000000000..90998b12f8 --- /dev/null +++ b/cmake/ports/glslang/0001-Include-cstdint-header-in-Common.h.patch @@ -0,0 +1,60 @@ +From 1e4955adbcd9b3f5eaf2129e918ca057baed6520 Mon Sep 17 00:00:00 2001 +From: Arcady Goldmints-Orlov +Date: Mon, 20 Feb 2023 20:02:36 -0500 +Subject: [PATCH] Include header in Common.h + +This change also cleans up some ifdef'd code for no longer supported +versions of MSVC. + +Fixes: #3139 +--- + glslang/Include/Common.h | 19 ++----------------- + 1 file changed, 2 insertions(+), 17 deletions(-) + +diff --git a/glslang/Include/Common.h b/glslang/Include/Common.h +index c7f52563..080b8071 100644 +--- a/glslang/Include/Common.h ++++ b/glslang/Include/Common.h +@@ -44,6 +44,7 @@ + #else + #include + #endif ++#include + #include + #include + #include +@@ -66,7 +67,7 @@ std::string to_string(const T& val) { + } + #endif + +-#if (defined(_MSC_VER) && _MSC_VER < 1900 /*vs2015*/) || (defined(MINGW_HAS_SECURE_API) && MINGW_HAS_SECURE_API) ++#if defined(MINGW_HAS_SECURE_API) && MINGW_HAS_SECURE_API + #include + #ifndef snprintf + #define snprintf sprintf_s +@@ -82,22 +83,6 @@ std::string to_string(const T& val) { + #define UINT_PTR uintptr_t + #endif + +-#if defined(_MSC_VER) && _MSC_VER < 1800 +- #include +- inline long long int strtoll (const char* str, char** endptr, int base) +- { +- return _strtoi64(str, endptr, base); +- } +- inline unsigned long long int strtoull (const char* str, char** endptr, int base) +- { +- return _strtoui64(str, endptr, base); +- } +- inline long long int atoll (const char* str) +- { +- return strtoll(str, NULL, 10); +- } +-#endif +- + #if defined(_MSC_VER) + #define strdup _strdup + #endif +-- +2.47.2 + diff --git a/cmake/ports/glslang/portfile.cmake b/cmake/ports/glslang/portfile.cmake index 47e0105ec9..6f81676faf 100644 --- a/cmake/ports/glslang/portfile.cmake +++ b/cmake/ports/glslang/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( REF 11.13.0 SHA512 20c2a6543b002648f459f26bd36b5c445afd6d8eae175e400dbe45632f11ca8de1f9e6f6e98fd6f910aa75d90063e174c095e7df26d9d4982192b84d08b0dc8b HEAD_REF master + PATCHES 0001-Include-cstdint-header-in-Common.h.patch ) vcpkg_configure_cmake( From 785418ec20eeaffa2c6a57e97ec056d371e218cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Gro=C3=9F?= Date: Sat, 1 Mar 2025 18:22:14 +0100 Subject: [PATCH 6/7] Patch glslang for GCC 15 compatibility. --- ...uilder.h-add-missing-cstdint-include.patch | 30 +++++++++++++++++++ cmake/ports/glslang/portfile.cmake | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 cmake/ports/glslang/0001-SPIRV-SpvBuilder.h-add-missing-cstdint-include.patch diff --git a/cmake/ports/glslang/0001-SPIRV-SpvBuilder.h-add-missing-cstdint-include.patch b/cmake/ports/glslang/0001-SPIRV-SpvBuilder.h-add-missing-cstdint-include.patch new file mode 100644 index 0000000000..13602907bb --- /dev/null +++ b/cmake/ports/glslang/0001-SPIRV-SpvBuilder.h-add-missing-cstdint-include.patch @@ -0,0 +1,30 @@ +From e40c14a3e007fac0e4f2e4164fdf14d1712355bd Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Fri, 2 Aug 2024 22:44:21 +0100 +Subject: [PATCH] SPIRV/SpvBuilder.h: add missing include + +Without the change `glslang` build fails on upcoming `gcc-15` as: + + In file included from /build/source/SPIRV/GlslangToSpv.cpp:45: + SPIRV/SpvBuilder.h:248:30: error: 'uint32_t' has not been declared + 248 | Id makeDebugLexicalBlock(uint32_t line); + | ^~~~~~~~ +--- + SPIRV/SpvBuilder.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/SPIRV/SpvBuilder.h b/SPIRV/SpvBuilder.h +index f86dd81b..d688436a 100644 +--- a/SPIRV/SpvBuilder.h ++++ b/SPIRV/SpvBuilder.h +@@ -56,6 +56,7 @@ namespace spv { + } + + #include ++#include + #include + #include + #include +-- +2.47.2 + diff --git a/cmake/ports/glslang/portfile.cmake b/cmake/ports/glslang/portfile.cmake index 6f81676faf..0841e6090d 100644 --- a/cmake/ports/glslang/portfile.cmake +++ b/cmake/ports/glslang/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( REF 11.13.0 SHA512 20c2a6543b002648f459f26bd36b5c445afd6d8eae175e400dbe45632f11ca8de1f9e6f6e98fd6f910aa75d90063e174c095e7df26d9d4982192b84d08b0dc8b HEAD_REF master - PATCHES 0001-Include-cstdint-header-in-Common.h.patch + PATCHES 0001-Include-cstdint-header-in-Common.h.patch 0001-SPIRV-SpvBuilder.h-add-missing-cstdint-include.patch ) vcpkg_configure_cmake( From beb8d29519194b7b07de8b49da3a943c7585a75a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Gro=C3=9F?= Date: Sat, 1 Mar 2025 20:25:35 +0100 Subject: [PATCH 7/7] Disable Fedora 42 as their repository currently ships a CMake 4.0 release candidate, which breaks too many dependencies. --- .github/workflows/linux_server_build.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/linux_server_build.yml b/.github/workflows/linux_server_build.yml index 13515da152..15c7b39316 100644 --- a/.github/workflows/linux_server_build.yml +++ b/.github/workflows/linux_server_build.yml @@ -112,15 +112,15 @@ jobs: arch: aarch64 runner: [self_hosted, type-cax41, image-arm-app-docker-ce] - - os: fedora-42 - image: docker.io/overte/overte-server-build:0.1.6-fedora-42-amd64 - arch: amd64 - runner: [self_hosted, type-cx52, image-x86-app-docker-ce] + #~ - os: fedora-42 + #~ image: docker.io/overte/overte-server-build:0.1.6-fedora-42-amd64 + #~ arch: amd64 + #~ runner: [self_hosted, type-cx52, image-x86-app-docker-ce] - - os: fedora-42 - image: docker.io/overte/overte-server-build:0.1.6-fedora-42-aarch64 - arch: aarch64 - runner: [self_hosted, type-cax41, image-arm-app-docker-ce] + #~ - os: fedora-42 + #~ image: docker.io/overte/overte-server-build:0.1.6-fedora-42-aarch64 + #~ arch: aarch64 + #~ runner: [self_hosted, type-cax41, image-arm-app-docker-ce] - os: rockylinux-9 image: docker.io/overte/overte-server-build:0.1.6-rockylinux-9-amd64