Set default ubuntu to 22 and set zig for cross linux compatibility

dora-rs · Nov 18, 2024 · 2da6375 · 2da6375
1 parent b6ef589
commit 2da6375
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 16 deletions.
diff --git a/.github/workflows/node-hub-ci-cd.yml b/.github/workflows/node-hub-ci-cd.yml
@@ -13,7 +13,7 @@ on:
 
 jobs:
   find-jobs:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     name: Find Jobs
     outputs:
       folders: ${{ steps.jobs.outputs.folders }}
@@ -33,7 +33,7 @@ jobs:
         working-directory: node-hub/${{ matrix.folder }}
     strategy:
       matrix:
-        platform: [ubuntu-20.04, macos-12]
+        platform: [ubuntu-22.04, macos-12]
         folder: ${{ fromJson(needs.find-jobs.outputs.folders )}}
       fail-fast: false
     steps:
@@ -85,7 +85,7 @@ jobs:
         working-directory: node-hub/${{ matrix.folder }}
     strategy:
       matrix:
-        platform: [ubuntu-20.04, macos-12]
+        platform: [ubuntu-22.04, macos-12]
         folder: ${{ fromJson(needs.find-jobs.outputs.folders )}}
       fail-fast: false
     runs-on: ${{ matrix.platform }}
@@ -141,7 +141,10 @@ jobs:
             if [[ -f "Cargo.toml" && -f "pyproject.toml" ]]; then
               echo "Publishing $dir using maturin..."
               pip3 install "maturin[patchelf]"                                                                             
-              maturin publish  --skip-existing --zig
+              if [[ "${{ matrix.platform }}" == "ubuntu-latest" ]]; then
+                maturin publish  --skip-existing --zig
+              else
+                maturin publish  --skip-existing
             else
               if [ -f "pyproject.toml" ]; then
                 echo "Publishing $dir using Poetry..."

diff --git a/.github/workflows/pip-release.yml b/.github/workflows/pip-release.yml
@@ -27,17 +27,17 @@ jobs:
     strategy:
       matrix:
         platform:
-          - runner: ubuntu-20.04
+          - runner: ubuntu-22.04
             target: x86_64
-          - runner: ubuntu-20.04
+          - runner: ubuntu-22.04
             target: x86
-          - runner: ubuntu-20.04
+          - runner: ubuntu-22.04
             target: aarch64
-          - runner: ubuntu-20.04
+          - runner: ubuntu-22.04
             target: armv7
-          # - runner: ubuntu-20.04
+          # - runner: ubuntu-22.04
           # target: s390x
-          # - runner: ubuntu-20.04
+          # - runner: ubuntu-22.04
           # target: ppc64le
         repository:
           - path: apis/python/node
@@ -73,11 +73,11 @@ jobs:
     strategy:
       matrix:
         platform:
-          - runner: ubuntu-20.04
+          - runner: ubuntu-22.04
             target: x86_64
-          - runner: ubuntu-20.04
+          - runner: ubuntu-22.04
             target: x86
-          - runner: ubuntu-20.04
+          - runner: ubuntu-22.04
             target: aarch64
         repository:
           - path: apis/python/node
@@ -105,7 +105,7 @@ jobs:
           path: ${{ matrix.repository.path }}/dist
 
   musleabi:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         platform:
@@ -210,7 +210,7 @@ jobs:
           path: ${{ matrix.repository.path }}/dist
 
   sdist:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         repository:
@@ -235,7 +235,7 @@ jobs:
 
   release:
     name: Release
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     if: github.event_name == 'workflow_dispatch' || github.event_name == 'release' && startsWith(github.ref, 'refs/tags/')
     needs: [linux, musllinux, musleabi, windows, macos, sdist]
     strategy: