Fixe issues and add ubuntu 22 support

Signed-off-by: Roshan Khatri <[email protected]>
roshkhatri · Dec 11, 2024 · 5844cb1 · 5844cb1
1 parent bef4013
commit 5844cb1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 14 deletions.
diff --git a/.github/actions/generate-package-build-matrix/action.yml b/.github/actions/generate-package-build-matrix/action.yml
@@ -24,7 +24,7 @@ runs:
 
     - name: Get targets
       run: |
-        x86_arch=$(jq -c '[.linux_targets[] | select(.arch=="x86_64") | .target |= sub("ubuntu([0-9]+\\.[0-9]+)"; "ubuntu-\1")]' utils/releasetools/build-config.json)
+        x86_arch=$(jq -c '[.linux_targets[] | select(.arch=="x86_64")]' utils/releasetools/build-config.json)
         x86_matrix=$(echo "{ \"distro\" : $x86_arch }" | jq -c .)
         echo "X86_MATRIX=$x86_matrix" >> $GITHUB_ENV
 

diff --git a/utils/releasetools/build-config.json b/utils/releasetools/build-config.json
@@ -1,29 +1,24 @@
 {
     "linux_targets": [
+
         {
           "arch": "x86_64",
-          "target": "ubuntu18.04",
+          "target": "ubuntu-20.04",
           "type": "deb",
-          "platform": "bionic"
+          "platform": "focal"
         },
         {
           "arch": "x86_64",
-          "target": "ubuntu20.04",
+          "target": "ubuntu-22.04",
           "type": "deb",
-          "platform": "focal"
+          "platform": "jammy"
         },
         {
           "arch": "x86_64",
-          "target": "ubuntu24.04",
+          "target": "ubuntu-24.04",
           "type": "deb",
           "platform": "noble"
         },
-        {
-          "arch": "arm64",
-          "target": "ubuntu18.04",
-          "type": "deb",
-          "platform": "bionic"
-        },
         {
           "arch": "arm64",
           "target": "ubuntu20.04",
@@ -32,9 +27,9 @@
         },
         {
           "arch": "arm64",
-          "target": "ubuntu24.04",
+          "target": "ubuntu22.04",
           "type": "deb",
-          "platform": "noble"
+          "platform": "jammy"
         }
       ]
 }