Do not use containers on arm64

Signed-off-by: Sean Young <sean@mess.org>
hyperledger · Apr 29, 2024 · e3295c3 · e3295c3
1 parent a1aaaa0
commit e3295c3
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -32,13 +32,22 @@ jobs:
     name: 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

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -111,13 +111,22 @@ jobs:
     name: Linux Arm
     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