From e2f6727022ea063f77bcb9c6479ddaefdbcaed84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9ophile=20Diot?= <tdiot@bunkerity.com>
Date: Tue, 6 Feb 2024 16:26:25 +0100
Subject: [PATCH] Add el9 to package cloud linux being pushed

---
 .github/workflows/beta.yml              | 12 ++++--------
 .github/workflows/dev.yml               |  4 ++--
 .github/workflows/push-packagecloud.yml | 17 ++++++++++++++++-
 .github/workflows/release.yml           | 12 ++++--------
 .github/workflows/staging.yml           |  4 ++--
 5 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml
index 3dae46974..b44cc473c 100644
--- a/.github/workflows/beta.yml
+++ b/.github/workflows/beta.yml
@@ -179,7 +179,7 @@ jobs:
     needs: [wait-builds]
     strategy:
       matrix:
-        linux: [ubuntu, debian, fedora, el]
+        linux: [ubuntu, debian, fedora, el, el9]
         arch: [amd64, arm64]
         include:
           - release: beta
@@ -204,7 +204,7 @@ jobs:
             suffix: "1."
             version: 8
             package: rpm
-          - linux: el
+          - linux: el9
             separator: "-"
             suffix: "1."
             version: 9
@@ -221,11 +221,9 @@ jobs:
           - linux: el
             arch: amd64
             package_arch: x86_64
-            version: 8
-          - linux: el
+          - linux: el9
             arch: amd64
             package_arch: x86_64
-            version: 9
           - linux: ubuntu
             arch: arm64
             package_arch: arm64
@@ -238,11 +236,9 @@ jobs:
           - linux: el
             arch: arm64
             package_arch: aarch64
-            version: 8
-          - linux: el
+          - linux: el9
             arch: arm64
             package_arch: aarch64
-            version: 9
     uses: ./.github/workflows/push-packagecloud.yml
     with:
       SEPARATOR: ${{ matrix.separator }}
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index fbb4ebfe7..340f193c5 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -164,7 +164,7 @@ jobs:
     needs: [tests-ui-linux, tests-core-linux]
     strategy:
       matrix:
-        linux: [ubuntu, debian, fedora, el]
+        linux: [ubuntu, debian, fedora, el, el9]
         arch: [amd64]
         include:
           - release: dev
@@ -193,7 +193,7 @@ jobs:
             suffix: "1."
             version: 8
             package: rpm
-          - linux: el
+          - linux: el9
             package_arch: x86_64
             separator: "-"
             suffix: "1."
diff --git a/.github/workflows/push-packagecloud.yml b/.github/workflows/push-packagecloud.yml
index 3a9be16c5..f5355c0ba 100644
--- a/.github/workflows/push-packagecloud.yml
+++ b/.github/workflows/push-packagecloud.yml
@@ -54,7 +54,12 @@ jobs:
           name: package-rhel-${{ inputs.PACKAGE_ARCH }}
           path: /tmp/${{ inputs.LINUX }}
       - uses: actions/download-artifact@6b208ae046db98c579e8a3aa621ab581ff575935 # v4.1.1
-        if: inputs.LINUX == 'el' && inputs.VERSION == '9'
+        if: inputs.LINUX == 'el'
+        with:
+          name: package-rhel-${{ inputs.PACKAGE_ARCH }}
+          path: /tmp/${{ inputs.LINUX }}
+      - uses: actions/download-artifact@6b208ae046db98c579e8a3aa621ab581ff575935 # v4.1.1
+        if: inputs.LINUX == 'el9'
         with:
           name: package-rhel9-${{ inputs.PACKAGE_ARCH }}
           path: /tmp/${{ inputs.LINUX }}
@@ -70,6 +75,7 @@ jobs:
       #   run: sudo apt install -y rename && rename 's/[0-9]\.[0-9]\.[0-9]/testing/' /tmp/${{ inputs.LINUX }}/*.${{ inputs.PACKAGE }}
       # Push package
       - name: Push package to packagecloud
+        if: inputs.LINUX != 'el9'
         uses: danielmundi/upload-packagecloud@46cd0e61152bf952dbc0d1759e609d3d22649030 # v1
         with:
           PACKAGE-NAME: /tmp/${{ inputs.LINUX }}/*.${{ inputs.PACKAGE }}
@@ -77,3 +83,12 @@ jobs:
           PACKAGECLOUD-REPO: ${{ inputs.REPO }}
           PACKAGECLOUD-DISTRIB: ${{ inputs.LINUX }}/${{ inputs.VERSION }}
           PACKAGECLOUD-TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
+      - name: Push package to packagecloud
+        if: inputs.LINUX == 'el9'
+        uses: danielmundi/upload-packagecloud@46cd0e61152bf952dbc0d1759e609d3d22649030 # v1
+        with:
+          PACKAGE-NAME: /tmp/${{ inputs.LINUX }}/*.${{ inputs.PACKAGE }}
+          PACKAGECLOUD-USERNAME: bunkerity
+          PACKAGECLOUD-REPO: ${{ inputs.REPO }}
+          PACKAGECLOUD-DISTRIB: el/9
+          PACKAGECLOUD-TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index baf6be7e5..1413fa908 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -191,7 +191,7 @@ jobs:
     needs: [wait-builds]
     strategy:
       matrix:
-        linux: [ubuntu, debian, fedora, el]
+        linux: [ubuntu, debian, fedora, el, el9]
         arch: [amd64, arm64]
         include:
           - release: latest
@@ -216,7 +216,7 @@ jobs:
             suffix: "1."
             version: 8
             package: rpm
-          - linux: el
+          - linux: el9
             separator: "-"
             suffix: "1."
             version: 9
@@ -233,11 +233,9 @@ jobs:
           - linux: el
             arch: amd64
             package_arch: x86_64
-            version: 8
-          - linux: el
+          - linux: el9
             arch: amd64
             package_arch: x86_64
-            version: 9
           - linux: ubuntu
             arch: arm64
             package_arch: arm64
@@ -250,11 +248,9 @@ jobs:
           - linux: el
             arch: arm64
             package_arch: aarch64
-            version: 8
-          - linux: el
+          - linux: el9
             arch: arm64
             package_arch: aarch64
-            version: 9
     uses: ./.github/workflows/push-packagecloud.yml
     with:
       SEPARATOR: ${{ matrix.separator }}
diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
index 6710687d1..b9f3c052d 100644
--- a/.github/workflows/staging.yml
+++ b/.github/workflows/staging.yml
@@ -199,7 +199,7 @@ jobs:
     needs: [staging-tests, tests-ui-linux, tests-core-linux]
     strategy:
       matrix:
-        linux: [ubuntu, debian, fedora, el]
+        linux: [ubuntu, debian, fedora, el, el9]
         arch: [amd64]
         include:
           - release: testing
@@ -228,7 +228,7 @@ jobs:
             suffix: "1."
             version: 8
             package: rpm
-          - linux: el
+          - linux: el9
             package_arch: x86_64
             separator: "-"
             suffix: "1."