Add aarch64 linux binary to release

JesseStutler · Sep 18, 2020 · 7e681c6 · 7e681c6
1 parent d3525b6
commit 7e681c6
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -44,17 +44,21 @@ jobs:
             os: ubuntu-latest
             rust: 1.45.2
             llvm_url: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/clang+llvm-10.0.0-x86_64-linux-gnu-ubuntu-18.04.tar.xz'
+            artifact_name: 'wasmer-linux-amd64'
           - build: macos
             os: macos-latest
             rust: 1.45.2
             llvm_url: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/clang+llvm-10.0.0-x86_64-apple-darwin.tar.xz'
+            artifact_name: 'wasmer-macos-amd64'
           - build: windows
             os: windows-latest
             rust: 1.45.2
+            artifact_name: 'wasmer-windows-amd64'
           - build: linux-arm
             os: [self-hosted, linux, ARM64]
             rust: 1.45.2
             llvm_url: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/clang+llvm-10.0.0-aarch64-linux-gnu.tar.xz'
+            artifact_name: 'wasmer-linux-aarch64'
     env:
       CARGO_SCCACHE_VERSION: 0.2.13
       SCCACHE_AZURE_BLOB_CONTAINER: wasmerstoragesccacheblob
@@ -147,7 +151,7 @@ jobs:
         uses: actions/upload-artifact@v2
         if: needs.setup.outputs.DOING_RELEASE == '1'
         with:
-          name: wasmer-${{ matrix.os }}
+          name: ${{ matrix.artifact_name }}
           path: dist
 
   release:
@@ -176,17 +180,17 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps 
-          asset_path: artifacts/wasmer-windows-latest/wasmer-windows.exe
+          asset_path: artifacts/wasmer-windows-amd64/wasmer-windows.exe
           asset_name: wasmer-windows.exe
           asset_content_type: application/vnd.microsoft.portable-executable
-      - name: Upload Release Asset Linux
+      - name: Upload Release Asset Linux amd64
         id: upload-release-asset-linux
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: artifacts/wasmer-ubuntu-latest/wasmer-linux-amd64.tar.gz
+          asset_path: artifacts/wasmer-linux-amd64/wasmer-linux-amd64.tar.gz
           asset_name: wasmer-linux-amd64.tar.gz
           asset_content_type: application/gzip
       - name: Upload Release Asset Mac
@@ -196,9 +200,19 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: artifacts/wasmer-macos-latest/wasmer-darwin-amd64.tar.gz
+          asset_path: artifacts/wasmer-macos-amd64/wasmer-darwin-amd64.tar.gz
           asset_name: wasmer-darwin-amd64.tar.gz
           asset_content_type: application/gzip
+      - name: Upload Release Asset Linux aarch64
+        id: upload-release-asset-linux
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: artifacts/wasmer-linux-aarch64/wasmer-linux-aarch64.tar.gz
+          asset_name: wasmer-linux-aarch64.tar.gz
+          asset_content_type: application/gzip
 
   audit:
     name: Audit

diff --git a/bors.toml b/bors.toml
@@ -2,6 +2,7 @@ status = [
     "Audit",
     "Code lint",
     "Test on linux",
+    "Test on linux-arm",
     "Test on macos",
     "Test on windows"
 ]