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] 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