Merge pull request #966 from JulianGro/ubuntu_2404

Add Ubuntu 24.04 to server packaging
overte-org · May 23, 2024 · ec5aa9f · ec5aa9f
2 parents 7bd436d + 32fe777
commit ec5aa9f
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 13 deletions.
diff --git 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-2023 Overte e.V.
+# Copyright 2021-2024 Overte e.V.
 # SPDX-License-Identifier: Apache-2.0
 
 name: Linux Server CI Build
@@ -65,26 +65,37 @@ jobs:
             arch: aarch64
             runner: linux_aarch64
 
-          - os: fedora-38
-            image: docker.io/overte/overte-server-build:0.1.3-fedora-38-amd64
+          - os: ubuntu-24.04
+            image: docker.io/overte/overte-server-build:0.1.3-ubuntu-24.04-amd64
             arch: amd64
             runner: linux_amd64
 
-          - os: fedora-38
-            image: docker.io/overte/overte-server-build:0.1.3-fedora-38-aarch64
+          - os: ubuntu-24.04
+            image: docker.io/overte/overte-server-build:0.1.3-ubuntu-24.04-aarch64
             arch: aarch64
             runner: linux_aarch64
 
-          - os: fedora-39
-            image: docker.io/overte/overte-server-build:0.1.4-fedora-39-amd64
+          - os: fedora-38
+            image: docker.io/overte/overte-server-build:0.1.3-fedora-38-amd64
             arch: amd64
             runner: linux_amd64
 
-          - os: fedora-39
-            image: docker.io/overte/overte-server-build:0.1.4-fedora-39-aarch64
+          - os: fedora-38
+            image: docker.io/overte/overte-server-build:0.1.3-fedora-38-aarch64
             arch: aarch64
             runner: linux_aarch64
 
+          # Packaging broken; See: https://github.com/overte-org/overte/issues/968
+          #~ - 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

diff --git a/cmake/ports/node/portfile.cmake b/cmake/ports/node/portfile.cmake
@@ -1,4 +1,4 @@
-# Copyright 2023 Overte e.V.
+# Copyright 2023-2024 Overte e.V.
 # SPDX-License-Identifier: Apache-2.0
 
 set(NODE_VERSION 18.14.2)
@@ -28,9 +28,9 @@ else ()
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO nodejs/node
-        REF v18.16.1
-        SHA512 cd2d7871a1a2aca8d800e0a501bd2836cbce076de750dcfc0b2bbe602c8a23705154bfb12faa3ff78e25ec753f419220742228569c281fa458987fb24f6d4d09
-        HEAD_REF v18.16.1
+        REF v18.20.2
+        SHA512 10d3637c26274677d137f76bbb648d0e7851c994634a16c89858c3a13094a0692ea2cb9a787c6463c3001abd71dab0d83123127bc305171d097c48d21d691678
+        HEAD_REF v18.20.2
     )
     # 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/tools/ci-scripts/deb_package/Dockerfile_build_ubuntu-24.04 b/tools/ci-scripts/deb_package/Dockerfile_build_ubuntu-24.04
@@ -0,0 +1,38 @@
+# 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.3-ubuntu-24.04 -f Dockerfile_build_ubuntu-24.04 .
+FROM ubuntu:24.04
+LABEL maintainer="Julian Groß ([email protected])"
+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 cmake g++ libssl-dev libqt5websockets5-dev qtdeclarative5-dev qtmultimedia5-dev python3-setuptools python3-distro mesa-common-dev libgl1-mesa-dev libsystemd-dev
+# 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