From 4a57c8e44753a9e5eb816d50ccf139bf9e4b9e06 Mon Sep 17 00:00:00 2001
From: Raphael <68374617+raphaelscholle@users.noreply.github.com>
Date: Wed, 27 Sep 2023 20:07:25 +0200
Subject: [PATCH] add release branch

---
 .github/workflows/build_android_signed.yml       | 14 ++++++++++++--
 .github/workflows/build_package_Rock5.yml        | 16 +++++++++++-----
 .github/workflows/build_package_rpi.yml          | 16 +++++++++++-----
 .github/workflows/build_package_x86_jammy.yml    | 15 +++++++++++----
 ...b_release.yml => build_package_x86_lunar.yml} |  8 ++++++--
 build_chroot.sh                                  |  4 ++--
 6 files changed, 53 insertions(+), 20 deletions(-)
 rename .github/workflows/{build_package_x86_usb_release.yml => build_package_x86_lunar.yml} (92%)

diff --git a/.github/workflows/build_android_signed.yml b/.github/workflows/build_android_signed.yml
index 51d3a5cd9..652939456 100644
--- a/.github/workflows/build_android_signed.yml
+++ b/.github/workflows/build_android_signed.yml
@@ -1,7 +1,17 @@
 name: build_android_signed
 
-on: [push]
-
+on:
+  push:
+   branches:
+      - "2.5-evo"
+      - "dev-release"
+      - "release"
+   paths-ignore:
+      - '**.md'
+      - '**.asciidoc'
+      - '**.adoc'
+      - '.gitignore'
+      - 'LICENSE'
 
 defaults:
   run:
diff --git a/.github/workflows/build_package_Rock5.yml b/.github/workflows/build_package_Rock5.yml
index 203479dc4..2c083d313 100644
--- a/.github/workflows/build_package_Rock5.yml
+++ b/.github/workflows/build_package_Rock5.yml
@@ -2,10 +2,16 @@ name: build_package_rock5_debian
 
 on:
   push:
-    branches: [ "2.5-evo" ]
-  pull_request:
-    branches: [ "2.5-evo" ]
-
+   branches:
+      - "2.5-evo"
+      - "dev-release"
+      - "release"
+   paths-ignore:
+      - '**.md'
+      - '**.asciidoc'
+      - '**.adoc'
+      - '.gitignore'
+      - 'LICENSE'
 jobs:
   build:
     #runs-on: ubuntu-18.04
@@ -36,7 +42,7 @@ jobs:
       - name: Build Package
         run: |
           git clone https://github.com/OpenHD/ChrootCompilationTest /opt/ChrootCompilationTest
-          git clone -b 2.5-evo https://github.com/OpenHD/QOpenHD --recursive /opt/ChrootCompilationTest/additionalFiles
+          git clone -b ${{ github.ref_name }} https://github.com/OpenHD/QOpenHD --recursive /opt/ChrootCompilationTest/additionalFiles
           echo $CLOUDSMITH_API_KEY > /opt/ChrootCompilationTest/additionalFiles/cloudsmith_api_key.txt
           cd /opt/ChrootCompilationTest/
           sudo apt update
diff --git a/.github/workflows/build_package_rpi.yml b/.github/workflows/build_package_rpi.yml
index 7655dd880..ff27801cb 100644
--- a/.github/workflows/build_package_rpi.yml
+++ b/.github/workflows/build_package_rpi.yml
@@ -2,10 +2,16 @@ name: build_package_rpi
 
 on:
   push:
-    branches: [ "2.5-evo" ]
-  pull_request:
-    branches: [ "2.5-evo" ]
-
+   branches:
+      - "2.5-evo"
+      - "dev-release"
+      - "release"
+   paths-ignore:
+      - '**.md'
+      - '**.asciidoc'
+      - '**.adoc'
+      - '.gitignore'
+      - 'LICENSE'
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
   BUILD_TYPE: Release
@@ -68,7 +74,7 @@ jobs:
         command: "push"
         format: "deb"
         owner: "openhd"
-        repo: "openhd-2-3-evo"
+        repo: ${{ github.ref_name }}
         distro: "raspbian"
         release: "bullseye"
         republish: "true" # needed ONLY if version is not changing
diff --git a/.github/workflows/build_package_x86_jammy.yml b/.github/workflows/build_package_x86_jammy.yml
index 03d9adf54..56666c038 100644
--- a/.github/workflows/build_package_x86_jammy.yml
+++ b/.github/workflows/build_package_x86_jammy.yml
@@ -2,9 +2,16 @@ name: build_package_x86_22
 
 on:
   push:
-    branches: [ "2.5-evo" ]
-  pull_request:
-      branches: [ "2.5-evo" ]
+   branches:
+      - "2.5-evo"
+      - "dev-release"
+      - "release"
+   paths-ignore:
+      - '**.md'
+      - '**.asciidoc'
+      - '**.adoc'
+      - '.gitignore'
+      - 'LICENSE'
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
@@ -47,7 +54,7 @@ jobs:
         command: "push"
         format: "deb"
         owner: "openhd"
-        repo: "openhd-2-3-evo"
+        repo: ${{ github.ref_name }}
         distro: "ubuntu"
         release: "jammy"
         republish: "true" # needed ONLY if version is not changing
diff --git a/.github/workflows/build_package_x86_usb_release.yml b/.github/workflows/build_package_x86_lunar.yml
similarity index 92%
rename from .github/workflows/build_package_x86_usb_release.yml
rename to .github/workflows/build_package_x86_lunar.yml
index 06694e6a0..29921cbb9 100644
--- a/.github/workflows/build_package_x86_usb_release.yml
+++ b/.github/workflows/build_package_x86_lunar.yml
@@ -2,7 +2,11 @@ name: build_package_LUNAR
 
 on:
   push:
-    paths-ignore:
+   branches:
+      - "2.5-evo"
+      - "dev-release"
+      - "release"
+   paths-ignore:
       - '**.md'
       - '**.asciidoc'
       - '**.adoc'
@@ -62,7 +66,7 @@ jobs:
           command: "push"
           format: "deb"
           owner: "openhd"
-          repo: "openhd-2-3-evo"
+          repo: ${{ github.ref_name }}
           distro: "ubuntu"
           release: "lunar"
           republish: "true" # needed ONLY if version is not changing
diff --git a/build_chroot.sh b/build_chroot.sh
index f9b80779e..8ab5d847e 100644
--- a/build_chroot.sh
+++ b/build_chroot.sh
@@ -11,8 +11,8 @@ cp -v *.dep /opt/out/
 echo "copied deb file"
 echo "push to cloudsmith"
 git describe --exact-match HEAD >/dev/null 2>&1
-echo "Pushing the package to OpenHD 2.4 repository"
+echo "Pushing the package to OpenHD release repository"
 ls -a
 API_KEY=$(cat cloudsmith_api_key.txt)
-cloudsmith push deb --api-key "$API_KEY" openhd/openhd-2-3-evo/debian/bullseye *.deb || exit 1
+cloudsmith push deb --api-key "$API_KEY" openhd/release/debian/bullseye *.deb || exit 1