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] 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 51bf4ae3bc..ccab2485ae 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 0dc06e2e98..0000000000 --- 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 b4131893c4..0000000000 --- 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