From 0073757454d43bd1b6f8a54ac3970043e6825cb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Wei=C3=9Fe?= <rweisse@users.noreply.github.com>
Date: Tue, 14 May 2024 09:00:13 +0200
Subject: [PATCH] Upgraded to ubuntu:24.04

---
 .github/workflows/deploy.yaml |  8 ++++----
 .github/workflows/test.yaml   | 21 ++++++++++++++++++---
 Dockerfile                    |  2 +-
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index 63f91c2..f956c36 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -255,11 +255,11 @@ jobs:
       - name: Trigger BUILD_Propti build
         if: env.BUILD_Propti == 'true'
         env:
-          TOKEN: ${{ secrets.DISPATCH_WORKFLOWS_PRIVATE_BCL_TOKEN }}
-          ORG: brandschutzconsult
-          REPO: propti-dockerfiles
+          TOKEN: ${{ secrets.DISPATCH_WORKFLOWS_PROPTI_TRISTAN_HEHNEN }}
+          ORG: FireDynamics
+          REPO: propti
         run: |
           curl -L  -X POST  -H "Accept: application/vnd.github+json" -H "X-GitHub-Api-Version: 2022-11-28" \
           -H "Authorization: Bearer ${TOKEN}" \
           https://api.github.com/repos/${ORG}/${REPO}/actions/workflows/${{ needs.prepare-build.outputs.WORKFLOW_ID }}/dispatches \
-          -d "{\"ref\":\"main\",\"inputs\": {\"tag\": \"${{ needs.prepare-build.outputs.TAG }}\"}}"
\ No newline at end of file
+          -d "{\"ref\":\"master\",\"inputs\": {\"tag\": \"${{ needs.prepare-build.outputs.TAG }}\"}}"
\ No newline at end of file
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 3e52857..30053a7 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -33,15 +33,30 @@ jobs:
               git push origin --delete ${BRANCH}
             done
           fi
-      - name: Create new branch
+      - name: Extract productive branch
+        continue-on-error: true
         run: |
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
           git config user.name "github-actions[bot]"
           BRANCH=${{ github.ref_name }}
           NEW_BRANCH=$(echo ${BRANCH#test/} | grep -oEi "(nightly-)?[0-9]+\.[0-9]+\.[0-9]+")
           echo "NEW_BRANCH=${NEW_BRANCH}" >> $GITHUB_ENV
-          git switch -c ${NEW_BRANCH}
-          git push --set-upstream origin ${NEW_BRANCH}
+          echo "CREATE_NEW_BRANCH=true" >> $GITHUB_ENV
+          git fetch
+          git stash
+          git switch ${NEW_BRANCH}
+          echo "CREATE_NEW_BRANCH=false" >> $GITHUB_ENV
+      - name: Push to branch
+        run: |
+          if [[ ${{ env.CREATE_NEW_BRANCH }} == false ]]
+          then
+            git pull --unshallow
+            git merge -X theirs ${{ github.ref_name }}
+            git push
+          else
+            git switch -c ${{ env.NEW_BRANCH }}
+            git push --set-upstream origin ${{ env.NEW_BRANCH }}
+          fi
       - name: Trigger Deploy
         run: |
           curl -L  -X POST  -H "Accept: application/vnd.github+json" -H "X-GitHub-Api-Version: 2022-11-28" \
diff --git a/Dockerfile b/Dockerfile
index d5ac01a..4e28ab6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,7 +19,7 @@ RUN chmod +x /root/*.sh && \
 #####################
 # Copy FDS binaries #
 #####################
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 # set environment variables
 ENV FDSBINDIR=/root/FDS
 ENV impihome=$FDSBINDIR/INTEL