ci: add ubuntu-22 (#153)

rpcpool · Jun 29, 2023 · 53abdd9 · 53abdd9
1 parent ef9c079
commit 53abdd9
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 10 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,7 +12,10 @@ env:
 
 jobs:
   release:
-    runs-on: [ubuntu-20.04]
+    strategy:
+      matrix:
+        os: [ubuntu-20.04, ubuntu-22.04]
+    runs-on: ["${{ matrix.os }}"]
     steps:
       - uses: actions/checkout@v3
 
@@ -41,8 +44,8 @@ jobs:
               ~/.cargo/registry/index/
               ~/.cargo/registry/cache/
               ~/.cargo/git/db/
-              yellowstone-grpc/target/
-          key: cargo-${{ hashFiles('rust-toolchain.toml') }}-${{ hashFiles('**/Cargo.lock') }}-0001
+              target
+          key: ${{ matrix.os }}-cargo-${{ hashFiles('rust-toolchain.toml') }}-${{ hashFiles('**/Cargo.lock') }}-0001
 
       - name: Check Solana version
         run: |
@@ -59,6 +62,14 @@ jobs:
       - name: Build release tarball
         run: ./ci/create-tarball.sh
 
+      - name: rename binaries for ubuntu22 release
+        if: matrix.os == 'ubuntu-22.04'
+        run: |
+          mv target/release/client target/release/client22
+          mv target/release/config-check target/release/config-check22
+          mv ${{ env.GEYSER_PLUGIN_NAME }}-release-x86_64-unknown-linux-gnu.tar.bz2 ${{ env.GEYSER_PLUGIN_NAME }}-release22-x86_64-unknown-linux-gnu.tar.bz2
+          mv ${{ env.GEYSER_PLUGIN_NAME }}-release-x86_64-unknown-linux-gnu.yml ${{ env.GEYSER_PLUGIN_NAME }}-release22-x86_64-unknown-linux-gnu.yml
+
       - name: Release
         if: startsWith(github.ref, 'refs/tags/')
         uses: softprops/action-gh-release@v1
@@ -69,7 +80,7 @@ jobs:
             solana ${{ env.SOLANA_VERSION }}
             rust ${{ env.RUST_STABLE }}
           files: |
-            ${{ env.GEYSER_PLUGIN_NAME }}-release-*
+            ${{ env.GEYSER_PLUGIN_NAME }}-release*
             yellowstone-grpc-proto/proto/*.proto
-            target/release/client
-            target/release/config-check
+            target/release/client*
+            target/release/config-check*
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -8,7 +8,10 @@ env:
 
 jobs:
   test:
-    runs-on: [ubuntu-20.04]
+    strategy:
+      matrix:
+        os: [ubuntu-20.04, ubuntu-22.04]
+    runs-on: ["${{ matrix.os }}"]
     steps:
       - uses: actions/checkout@v3
 
@@ -37,8 +40,8 @@ jobs:
               ~/.cargo/registry/index/
               ~/.cargo/registry/cache/
               ~/.cargo/git/db/
-              yellowstone-grpc/target/
-          key: cargo-${{ hashFiles('rust-toolchain.toml') }}-${{ hashFiles('**/Cargo.lock') }}-0001
+              target
+          key: ${{ matrix.os }}-cargo-${{ hashFiles('rust-toolchain.toml') }}-${{ hashFiles('**/Cargo.lock') }}-0001
 
       - name: cargo tree
         run: |

diff --git a/ci/env.sh b/ci/env.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
-plugin_name=yellowstone-grpc-geyser-release
+plugin_name=yellowstone-grpc-geyser
 plugin_lib_name=yellowstone_grpc_geyser