Merge pull request #1281 from JulianGro/gha-update-2712

Update GitHub Actions
2025-03-27 23:52:03 +01:00 · 2024-12-28 21:30:33 +01:00 · 2024-12-28 21:30:33 +01:00 · 1e40a6b6ae
commit 1e40a6b6ae
parent a55d019252 c1906ae3f2
9 changed files with 16 additions and 49 deletions
--- a/.github/workflows/linux_server_build.yml
+++ b/.github/workflows/linux_server_build.yml
@ -82,16 +82,6 @@ jobs:
            arch: aarch64
            runner: [self_hosted, type-cax41, image-arm-app-docker-ce]

-          - os: fedora-39
-            image: docker.io/overte/overte-server-build:0.1.4-fedora-39-amd64
-            arch: amd64
-            runner: [self_hosted, type-cx52, image-x86-app-docker-ce]
-
-          - os: fedora-39
-            image: docker.io/overte/overte-server-build:0.1.4-fedora-39-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
            arch: amd64
@ -224,10 +214,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-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
          elif [ "${{ matrix.os }}" == "fedora-40" ]; then
            echo "ARTIFACT_PATTERN=overte-server-$RPMVERSION-1.fc40.$INSTALLER_EXT" >> $GITHUB_ENV
          else
@ -266,7 +252,7 @@ jobs:

    - name: Archive cmake logs
      if: always()
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
      with:
        name: cmake-logs-${{ matrix.os }}-${{ matrix.arch }}-${{ github.event.number }}.tar.xz
        path: cmake-logs-${{ matrix.os }}-${{ matrix.arch }}-${{ github.event.number }}.tar.xz
--- a/.github/workflows/master_build.yml
+++ b/.github/workflows/master_build.yml
@ -65,7 +65,7 @@ jobs:
      run: |

        echo "UPLOAD_PREFIX=build/overte/master" >> $GITHUB_ENV
-        echo ::set-output name=github_sha_short::`echo $GIT_COMMIT | cut -c1-7`
+        echo "{github_sha_short}={`echo $GIT_COMMIT | cut -c1-7`}" >> $GITHUB_OUTPUT
        echo "JOB_NAME=build (${{matrix.os}}, ${{matrix.build_type}})" >> $GITHUB_ENV
        echo "APP_TARGET_NAME=$APP_NAME" >> $GITHUB_ENV
        # Linux build variables
@ -82,7 +82,7 @@ jobs:
          echo "ZIP_ARGS=-r" >> $GITHUB_ENV
          echo "INSTALLER_EXT=dmg" >> $GITHUB_ENV
          echo "CMAKE_EXTRA=-DOVERTE_CPU_ARCHITECTURE= -DCMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=OFF -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOPENSSL_LIBRARIES=/usr/local/opt/openssl/lib -G Xcode" >> $GITHUB_ENV
-          echo "::set-output name=symbols_archive::${BUILD_NUMBER}-${{ matrix.build_type }}-mac-symbols.zip"
+          echo "symbols_archive=${BUILD_NUMBER}-${{ matrix.build_type }}-mac-symbols.zip" >> $GITHUB_ENV
          echo "APP_TARGET_NAME=Overte" >> $GITHUB_ENV
        fi
        # Windows build variables
--- a/.github/workflows/master_deploy_apidocs.yml
+++ b/.github/workflows/master_deploy_apidocs.yml
@ -31,7 +31,7 @@ jobs:
        jsdoc root.js -r api-mainpage.md -c config.json -d output

    - name: Deploy API-docs
-      uses: SamKirkland/FTP-Deploy-Action@v4.3.4
+      uses: SamKirkland/FTP-Deploy-Action@v4.3.5
      with:
        server: www531.your-server.de
        protocol: ftps
--- a/.github/workflows/master_deploy_doxygen.yml
+++ b/.github/workflows/master_deploy_doxygen.yml
@ -29,7 +29,7 @@ jobs:
        doxygen Doxyfile

    - name: Deploy Doxygen
-      uses: SamKirkland/FTP-Deploy-Action@v4.3.4
+      uses: SamKirkland/FTP-Deploy-Action@v4.3.5
      with:
        server: www531.your-server.de
        protocol: ftps
--- a/.github/workflows/pr_build.yml
+++ b/.github/workflows/pr_build.yml
@ -64,8 +64,8 @@ jobs:
              runner: [self_hosted, type-cx52, image-x86-app-docker-ce]
              arch: amd64
              build_type: full
-              apt-dependencies: pkg-config libxext-dev libdouble-conversion-dev libpcre2-16-0 libpulse0 libharfbuzz-dev libnss3 libnspr4 libxdamage1 libasound2 # add missing dependencies to docker image when convenient
-              image: docker.io/overte/overte-full-build:0.1.1-ubuntu-20.04-amd64
+              # apt-dependencies:  # add missing dependencies to docker image when convenient
+              image: docker.io/overte/overte-full-build:0.1.2-ubuntu-20.04-amd64
            # Android builds are currently failing
            #- os: ubuntu-18.04
            #  build_type: android
@ -75,7 +75,7 @@ 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.1-ubuntu-22.04-aarch64
+              image: docker.io/overte/overte-full-build:0.1.2-ubuntu-22.04-aarch64
        fail-fast: false
    runs-on: ${{matrix.runner}}
    container: ${{matrix.image}}
@ -244,7 +244,7 @@ jobs:

    - name: Archive cmake logs
      if: always()
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
      with:
        name: cmake-logs-${{ matrix.os }}-${{ github.event.number }}.tar.xz
        path: ./cmake-logs-${{ matrix.os }}-${{ github.event.number }}.tar.xz
--- a/.github/workflows/release_build.yml
+++ b/.github/workflows/release_build.yml
@ -56,7 +56,6 @@ jobs:
            echo "UPLOAD_PREFIX=build/overte/release/" >> $GITHUB_ENV
        fi

-        echo ::set-output name=github_sha_short::`echo $GIT_COMMIT | cut -c1-7`
        echo "JOB_NAME=${{matrix.os}}, ${{matrix.build_type}}" >> $GITHUB_ENV
        echo "APP_TARGET_NAME=$APP_NAME" >> $GITHUB_ENV

--- 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-2023 Overte e.V.
+# Copyright 2022-2024 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.1-ubuntu-20.04 -f Dockerfile_build_ubuntu-20.04 .
+# Example build: docker build -t overte/overte-full-build:0.1.2-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"
@ -18,6 +18,8 @@ RUN apt-get update && apt-get -y install tzdata
 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

 # Install tools for package creation
 RUN apt-get -y install sudo chrpath binutils dh-make
--- 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-2023 Overte e.V.
+# Copyright 2022-2024 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.1-ubuntu-22.04 -f Dockerfile_build_ubuntu-22.04 .
+# Example build: docker build -t overte/overte-full-build:0.1.2-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"
@ -19,7 +19,7 @@ RUN apt-get -y install curl ninja-build git cmake g++ libssl-dev libqt5websocket
 # Install Overte tools build dependencies
 RUN apt-get -y install libqt5webchannel5-dev qtwebengine5-dev libqt5xmlpatterns5-dev
 # Install Overte Interface build dependencies
-RUN apt-get -y install libqt5svg5-dev qttools5-dev
+RUN apt-get -y install libqt5svg5-dev qttools5-dev vulkan-validationlayers libvulkan-dev libvulkan1 libqt5x11extras5-dev qtbase5-private-dev
 # Install server-console build dependencies
 RUN apt-get -y install npm

--- a/tools/ci-scripts/rpm_package/Dockerfile_build_fedora-39
+++ b/tools/ci-scripts/rpm_package/Dockerfile_build_fedora-39
@ -1,20 +0,0 @@
-# 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