From fbfabb3096a4712e022c5b18f77f42ad9b8d110e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Gro=C3=9F?= Date: Sun, 11 Feb 2024 14:54:54 +0100 Subject: [PATCH 1/3] Remove End Of Life systems --- .github/workflows/linux_server_build.yml | 12 ----- .../deb_package/Dockerfile_build_ubuntu-18.04 | 44 ------------------- .../rpm_package/Dockerfile_build_fedora-37 | 20 --------- 3 files changed, 76 deletions(-) delete mode 100644 tools/ci-scripts/deb_package/Dockerfile_build_ubuntu-18.04 delete mode 100644 tools/ci-scripts/rpm_package/Dockerfile_build_fedora-37 diff --git a/.github/workflows/linux_server_build.yml b/.github/workflows/linux_server_build.yml index 51bf4ae3bc8..ccab2485ae0 100644 --- a/.github/workflows/linux_server_build.yml +++ b/.github/workflows/linux_server_build.yml @@ -65,16 +65,6 @@ jobs: arch: aarch64 runner: linux_aarch64 - - os: fedora-37 - image: docker.io/overte/overte-server-build:0.1.3-fedora-37-amd64 - arch: amd64 - runner: linux_amd64 - - - os: fedora-37 - image: docker.io/overte/overte-server-build:0.1.3-fedora-37-aarch64 - arch: aarch64 - runner: linux_aarch64 - - os: fedora-38 image: docker.io/overte/overte-server-build:0.1.3-fedora-38-amd64 arch: amd64 @@ -192,8 +182,6 @@ jobs: else # RPM if [ "${{ matrix.os }}" == "rockylinux-9" ]; then echo "ARTIFACT_PATTERN=overte-server-$RPMVERSION-1.el9.$INSTALLER_EXT" >> $GITHUB_ENV - elif [ "${{ matrix.os }}" == "fedora-37" ]; then - echo "ARTIFACT_PATTERN=overte-server-$RPMVERSION-1.fc37.$INSTALLER_EXT" >> $GITHUB_ENV elif [ "${{ matrix.os }}" == "fedora-38" ]; then echo "ARTIFACT_PATTERN=overte-server-$RPMVERSION-1.fc38.$INSTALLER_EXT" >> $GITHUB_ENV else diff --git a/tools/ci-scripts/deb_package/Dockerfile_build_ubuntu-18.04 b/tools/ci-scripts/deb_package/Dockerfile_build_ubuntu-18.04 deleted file mode 100644 index 0dc06e2e988..00000000000 --- a/tools/ci-scripts/deb_package/Dockerfile_build_ubuntu-18.04 +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 2022-2023 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-18.04 -f Dockerfile_build_ubuntu-18.04 . -FROM ubuntu:18.04 -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 Overte domain-server and assignment-client build dependencies -RUN apt-get -y install curl ninja-build git g++ libssl-dev python3-distutils python3-distro mesa-common-dev libgl1-mesa-dev libharfbuzz-dev libdouble-conversion1 libsystemd-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 for creating the server image -RUN apt-get -y install docker.io xz-utils - -# Install tools needed for our Github Actions Workflow -RUN apt-get -y install python3-boto3 python3-github zip - -# Install newer CMake -RUN curl -O -L https://github.com/Kitware/CMake/releases/download/v3.24.0/cmake-3.24.0-linux-x86_64.tar.gz -RUN tar -xf cmake-3.24.0-linux-x86_64.tar.gz -ENV PATH="/cmake-3.24.0-linux-x86_64/bin:$PATH" diff --git a/tools/ci-scripts/rpm_package/Dockerfile_build_fedora-37 b/tools/ci-scripts/rpm_package/Dockerfile_build_fedora-37 deleted file mode 100644 index b4131893c41..00000000000 --- a/tools/ci-scripts/rpm_package/Dockerfile_build_fedora-37 +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 2022-2023 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-fedora-37 -f Dockerfile_build_fedora-37 . -FROM fedora:37 -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-c++ openssl-devel qt5-qtwebsockets-devel qt5-qtmultimedia-devel unzip libXext-devel qt5-qtwebchannel-devel qt5-qtwebengine-devel qt5-qtxmlpatterns-devel systemd-devel - -# 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 From 8cc8be12b6b2fa2be4e8143eae811317f6542ea9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Gro=C3=9F?= Date: Sun, 11 Feb 2024 15:23:56 +0100 Subject: [PATCH 2/3] Downgrade to VCPKG version 2023.11.20 because of upstream regression https://github.com/microsoft/vcpkg/issues/36094 --- hifi_vcpkg.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hifi_vcpkg.py b/hifi_vcpkg.py index d276f75fd50..8e21714cd75 100644 --- a/hifi_vcpkg.py +++ b/hifi_vcpkg.py @@ -108,8 +108,8 @@ def __init__(self, args): elif 'Linux' == system and 'aarch64' == machine: self.exe = os.path.join(self.path, 'vcpkg') self.bootstrapCmds = [ os.path.join(self.path, 'bootstrap-vcpkg.sh'), '-disableMetrics' ] - self.vcpkgUrl = self.assets_url + '/dependencies/vcpkg/vcpkg-linux_aarch64_2024.01.12.tar.xz' - self.vcpkgHash = '222d82079f0e087b9978f4446dd2b11e19db3bbbaa3aac0de4710732d64f1d55fb506fc5b8979a61ab13834028e2141aa49a79ed83c0fb03b87944c707d2f2d3' + self.vcpkgUrl = self.assets_url + '/dependencies/vcpkg/vcpkg-linux_aarch64_2023.11.20.tar.xz' + self.vcpkgHash = 'f38efba40bd4b0b6df47986e373d5535d3e787e257cf19d66ee8ee00e670a6fb95b3e824020024f3edbdcf86a0548e5bbddcc0ac7bd2ff6352a245efac8402fe' self.hostTriplet = 'arm64-linux' else: self.exe = os.path.join(self.path, 'vcpkg') From 4f2c829766bc6b8907a363bd55ab9936428b650a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Gro=C3=9F?= Date: Sun, 11 Feb 2024 15:53:14 +0100 Subject: [PATCH 3/3] Add Fedora 39 support --- .github/workflows/linux_server_build.yml | 12 +++++++++++ .../rpm_package/Dockerfile_build_fedora-39 | 20 +++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 tools/ci-scripts/rpm_package/Dockerfile_build_fedora-39 diff --git a/.github/workflows/linux_server_build.yml b/.github/workflows/linux_server_build.yml index ccab2485ae0..ee21d0a21fb 100644 --- a/.github/workflows/linux_server_build.yml +++ b/.github/workflows/linux_server_build.yml @@ -75,6 +75,16 @@ jobs: arch: aarch64 runner: linux_aarch64 + - os: fedora-39 + image: docker.io/overte/overte-server-build:0.1.4-fedora-39-amd64 + arch: amd64 + runner: linux_amd64 + + - os: fedora-39 + image: docker.io/overte/overte-server-build:0.1.4-fedora-39-aarch64 + arch: aarch64 + runner: linux_aarch64 + - os: rockylinux-9 image: docker.io/overte/overte-server-build:0.1.3-rockylinux-9-amd64 arch: amd64 @@ -184,6 +194,8 @@ jobs: echo "ARTIFACT_PATTERN=overte-server-$RPMVERSION-1.el9.$INSTALLER_EXT" >> $GITHUB_ENV elif [ "${{ matrix.os }}" == "fedora-38" ]; then echo "ARTIFACT_PATTERN=overte-server-$RPMVERSION-1.fc38.$INSTALLER_EXT" >> $GITHUB_ENV + elif [ "${{ matrix.os }}" == "fedora-39" ]; then + echo "ARTIFACT_PATTERN=overte-server-$RPMVERSION-1.fc39.$INSTALLER_EXT" >> $GITHUB_ENV else echo "Error! ARTIFACT_PATTERN not set!" exit 1 # Fail diff --git a/tools/ci-scripts/rpm_package/Dockerfile_build_fedora-39 b/tools/ci-scripts/rpm_package/Dockerfile_build_fedora-39 new file mode 100644 index 00000000000..ef5ef248194 --- /dev/null +++ b/tools/ci-scripts/rpm_package/Dockerfile_build_fedora-39 @@ -0,0 +1,20 @@ +# Copyright 2022-2024 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-39 -f Dockerfile_build_fedora-39 . +FROM fedora:39 +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.11 + +# 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