From 7a36f3768753cf22ef5960e59cf0742f504b0290 Mon Sep 17 00:00:00 2001
From: Abi Hafshin <abi@hafs.in>
Date: Fri, 4 Nov 2022 01:20:07 +0700
Subject: [PATCH 1/2] Add multiplatform linux build to CI

---
 .github/workflows/release.yml | 44 +++++++++++++++++++++++++++++------
 1 file changed, 37 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 20129a2d9..310b7499b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,19 +12,35 @@ jobs:
   linux:
     name: Build - Linux
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - name: linux-aarch64
+            target: aarch64-unknown-linux-gnu
+          - name: linux
+            target: x86_64-unknown-linux-gnu
     steps:
       - name: Check out code
         uses: actions/checkout@v2
-      - name: Set up docker image
-        run: docker build -t volta .
-        working-directory: ./ci/docker
-      - name: Compile and package Volta
-        run: docker run --volume ${PWD}:/root/workspace --workdir /root/workspace --rm --init --tty volta /root/workspace/ci/build-linux.sh volta-linux
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: 1.63
+          override: true
+      - name: Cargo Cache
+        uses: Swatinem/rust-cache@v2
+      - name: Install cross
+        run: cargo install cross
+      - name: Build
+        run: cross build --release --target ${{ matrix.target }}
+      - name: Create artifact
+        run: tar -czvf volta-${{ matrix.name }}.tar.gz volta volta-shim volta-migrate
+        working-directory: target/${{ matrix.target }}/release
       - name: Upload release artifact
         uses: actions/upload-artifact@v2
         with:
-          name: linux
-          path: target/release/volta-linux.tar.gz
+          name: ${{ matrix.name }}
+          path: target/${{ matrix.target }}/release/volta-${{ matrix.name }}.tar.gz
 
   macos:
     name: Build - MacOS
@@ -149,6 +165,11 @@ jobs:
         with:
           name: linux
           path: release
+      - name: Fetch Linux (ARM) artifact
+        uses: actions/download-artifact@v2
+        with:
+          name: linux-aarch64
+          path: release
       - name: Fetch MacOS artifact
         uses: actions/download-artifact@v2
         with:
@@ -189,6 +210,15 @@ jobs:
           asset_path: ./release/volta-linux.tar.gz
           asset_name: volta-${{ steps.release_info.outputs.version }}-linux.tar.gz
           asset_content_type: application/gzip
+      - name: Upload Linux (ARM) artifact
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./release/volta-linux-aarch64.tar.gz
+          asset_name: volta-${{ steps.release_info.outputs.version }}-linux-aarch64.tar.gz
+          asset_content_type: application/gzip
       - name: Upload MacOS artifact
         uses: actions/upload-release-asset@v1
         env:

From 58ed28b328674da50ba5e90b2db795e9cdbb3c75 Mon Sep 17 00:00:00 2001
From: Abi Hafshin <abi@hafs.in>
Date: Sat, 5 Nov 2022 18:33:23 +0700
Subject: [PATCH 2/2] support linux-aarch on install script

---
 dev/unix/volta-install.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev/unix/volta-install.sh b/dev/unix/volta-install.sh
index 1e587b32f..5acf0f44f 100755
--- a/dev/unix/volta-install.sh
+++ b/dev/unix/volta-install.sh
@@ -129,6 +129,8 @@ parse_os_info() {
     Linux)
       if [ "$arch" == "x86_64" ]; then
         echo "linux"
+      elif [ "$arch" == "aarch64" ]; then
+        echo "linux-aarch64"
       else
         error "Releases for non x64 architectures are not currently supported."
         return 1