From 2ad79ffc1843b24e024e2f61a029caccc420f257 Mon Sep 17 00:00:00 2001
From: Raphael <68374617+raphaelscholle@users.noreply.github.com>
Date: Mon, 20 May 2024 15:46:31 +0200
Subject: [PATCH] fix noble build

---
 .github/workflows/build_package_x86_noble.yml | 10 +++-------
 package.sh                                    |  2 +-
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build_package_x86_noble.yml b/.github/workflows/build_package_x86_noble.yml
index aacaccee1..c336a727d 100644
--- a/.github/workflows/build_package_x86_noble.yml
+++ b/.github/workflows/build_package_x86_noble.yml
@@ -14,9 +14,7 @@ env:
 jobs:
   build:
     #runs-on: ubuntu-18.04
-    runs-on: ubuntu-22.04
-    container:
-      image: docker://ubuntu:noble
+    runs-on: ubuntu-24.04
     env:
       CLOUDSMITH_API_KEY: ${{ secrets.CLOUDSMITH_API_KEY }}
     steps:
@@ -24,8 +22,6 @@ jobs:
         run: |
           echo "DT=$(date +'%Y-%m-%d_%H%M')" >> $GITHUB_ENV
           echo "BRANCH=${GITHUB_REF##*/}" >> $GITHUB_ENV
-          apt update
-          apt install -y git sudo
 
       - name: clone QOpenHD
         run: |
@@ -35,7 +31,7 @@ jobs:
         run: |
           ls
           cd QOpenHD
-          apt install -y python3-pip
+          sudo apt install -y python3-pip
           pip install cloudsmith-api --break-system-packages
           pip install cloudsmith-cli --break-system-packages
           sudo -H ./install_build_dep.sh ubuntu-x86
@@ -71,7 +67,7 @@ jobs:
       #   if: ${{ github.ref != 'refs/heads/2.5-evo' }}
 
       - name: Push
+        if: github.ref_name == 'release' || github.ref_name == 'dev-release'
         run: |
-          if: github.ref_name == 'release' || github.ref_name == 'dev-release'
           ls -a
           cloudsmith push deb  -k ${{ secrets.CLOUDSMITH_API_KEY }} openhd/${{ github.ref_name }}/ubuntu/noble QOpenHD/*.deb
diff --git a/package.sh b/package.sh
index d768d50b5..e848b56cb 100755
--- a/package.sh
+++ b/package.sh
@@ -82,7 +82,7 @@ elif [[ "${PACKAGE_ARCH}" = "arm64" ]]; then
 cp rock_qt_eglfs_kms_config.json /tmp/qopenhd/usr/local/share/qopenhd/ || exit 1
 fi
 
-VERSION="2.5.4-beta-$(date -d '+1 hour' +'%m-%d-%Y--%H-%M-%S')-${VER2}"
+VERSION="2.5.4-rc-$(date -d '+1 hour' +'%m-%d-%Y--%H-%M-%S')-${VER2}"
 
 ls -a ${TMPDIR}/usr/local/bin
 echo "going into packaging stage"