Merge pull request #1916 from bunkerity/dev

Add support for Ubuntu Jammy in CI workflows for package builds
bunkerity · Jan 20, 2025 · 69b5c2f · 69b5c2f
2 parents 74f4aaf + 2e40c4b
commit 69b5c2f
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml
@@ -108,6 +108,8 @@ jobs:
             package: rpm
           - linux: rhel9
             package: rpm
+          - linux: ubuntu-jammy
+            package: deb
     uses: ./.github/workflows/linux-build.yml
     with:
       RELEASE: ${{ matrix.release }}
@@ -211,6 +213,11 @@ jobs:
             suffix: "1."
             version: 9
             package: rpm
+          - linux: ubuntu-jammy
+            separator: _
+            suffix: ""
+            version: jammy
+            package: deb
           - linux: ubuntu
             arch: amd64
             package_arch: amd64
@@ -226,6 +233,9 @@ jobs:
           - linux: el9
             arch: amd64
             package_arch: x86_64
+          - linux: ubuntu-jammy
+            arch: amd64
+            package_arch: amd64
           - linux: ubuntu
             arch: arm64
             package_arch: arm64
@@ -241,6 +251,9 @@ jobs:
           - linux: el9
             arch: arm64
             package_arch: aarch64
+          - linux: ubuntu-jammy
+            arch: arm64
+            package_arch: arm64
     uses: ./.github/workflows/push-packagecloud.yml
     with:
       SEPARATOR: ${{ matrix.separator }}

diff --git a/.github/workflows/rc.yml b/.github/workflows/rc.yml
@@ -108,6 +108,8 @@ jobs:
             package: rpm
           - linux: rhel9
             package: rpm
+          - linux: ubuntu-jammy
+            package: deb
     uses: ./.github/workflows/linux-build.yml
     with:
       RELEASE: ${{ matrix.release }}
@@ -184,7 +186,7 @@ jobs:
         linux: [ubuntu, debian, fedora, el, el9]
         arch: [amd64, arm64]
         include:
-          - release: rc
+          - release: latest
             repo: bunkerweb
           - linux: ubuntu
             separator: _
@@ -211,6 +213,11 @@ jobs:
             suffix: "1."
             version: 9
             package: rpm
+          - linux: ubuntu-jammy
+            separator: _
+            suffix: ""
+            version: jammy
+            package: deb
           - linux: ubuntu
             arch: amd64
             package_arch: amd64
@@ -226,6 +233,9 @@ jobs:
           - linux: el9
             arch: amd64
             package_arch: x86_64
+          - linux: ubuntu-jammy
+            arch: amd64
+            package_arch: amd64
           - linux: ubuntu
             arch: arm64
             package_arch: arm64
@@ -241,6 +251,9 @@ jobs:
           - linux: el9
             arch: arm64
             package_arch: aarch64
+          - linux: ubuntu-jammy
+            arch: arm64
+            package_arch: arm64
     uses: ./.github/workflows/push-packagecloud.yml
     with:
       SEPARATOR: ${{ matrix.separator }}