Преглед изворни кода

Add GitHub ARM64 runners (#1642)

Use github provided runners rather than our own.

Signed-off-by: Ry Jones <ry@linux.com>
Signed-off-by: Sean Young <sean@mess.org>
Ry Jones пре 1 година
родитељ
комит
10c6e57c78
2 измењених фајлова са 22 додато и 4 уклоњено
  1. 11 2
      .github/workflows/release.yml
  2. 11 2
      .github/workflows/test.yml

+ 11 - 2
.github/workflows/release.yml

@@ -30,15 +30,24 @@ jobs:
 
   linux-arm64:
     name: Linux arm64
-    runs-on: linux-arm64
+    runs-on: solang-arm
     if: ${{ github.repository_owner == 'hyperledger' }}
-    container: ghcr.io/hyperledger/solang-llvm:ci-7
     steps:
     - name: Checkout sources
       uses: actions/checkout@v3.1.0
       with:
         submodules: recursive
+    - name: Basic build tools
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y gcc g++ make
     - uses: dtolnay/rust-toolchain@1.74.0
+    - name: Get LLVM
+      run: curl -sSL --output llvm16.0-linux-arm64.tar.xz https://github.com/hyperledger/solang-llvm/releases/download/llvm16-0/llvm16.0-linux-arm64.tar.xz
+    - name: Extract LLVM
+      run: tar Jxf llvm16.0-linux-arm64.tar.xz
+    - name: Add LLVM to Path
+      run: echo "$(pwd)/llvm16.0/bin" >> $GITHUB_PATH
     - name: Build
       run: cargo build --verbose --release
     - name: Run tests

+ 11 - 2
.github/workflows/test.yml

@@ -109,15 +109,24 @@ jobs:
 
   linux-arm:
     name: Linux Arm
-    runs-on: linux-arm64
+    runs-on: solang-arm
     if: ${{ github.repository_owner == 'hyperledger' }}
-    container: ghcr.io/hyperledger/solang-llvm:ci-7
     steps:
     - name: Checkout sources
       uses: actions/checkout@v3
       with:
         submodules: recursive
+    - name: Basic build tools
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y gcc g++ make
     - uses: dtolnay/rust-toolchain@1.74.0
+    - name: Get LLVM
+      run: curl -sSL --output llvm16.0-linux-arm64.tar.xz https://github.com/hyperledger/solang-llvm/releases/download/llvm16-0/llvm16.0-linux-arm64.tar.xz
+    - name: Extract LLVM
+      run: tar Jxf llvm16.0-linux-arm64.tar.xz
+    - name: Add LLVM to Path
+      run: echo "$(pwd)/llvm16.0/bin" >> $GITHUB_PATH
     - name: Build
       run: cargo build --verbose
     - name: Run tests