Merge pull request #1558 from golemfactory/mf/aarch64-cross-build

aarch64: use `cross` for cross-compilation + fixes
golemfactory · Aug 10, 2021 · a5ca059 · a5ca059
1 parent 54c2683
commit a5ca059
Show file tree

Hide file tree

Showing 14 changed files with 102 additions and 180 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -151,6 +151,8 @@ jobs:
           asset_content_type: ${{ steps.pack.outputs.providerMedia }}
 
   build-aarch64:
+    env:
+      RUSTFLAGS: "-C link-arg=-s"
     needs: create-release
     runs-on: ubuntu-latest
     steps:
@@ -169,19 +171,31 @@ jobs:
             });
             console.log(release.data.upload_url);
             return release.data.upload_url
+
       - name: Check out repository
         uses: actions/checkout@v2
 
+      - name: Setup toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          target: aarch64-unknown-linux-musl
+          override: true
+
       - name: Build binaries
-        uses: docker://golemfactory/build-aarch64:0.1.1
+        uses: actions-rs/cargo@v1
         with:
-          workdir: /github/workspace
+          use-cross: true
+          command: build
           args: >
-            /bin/bash -c "
-              export HOME=/root &&
-              cargo build -p={yagna,ya-exe-unit,ya-provider,golemsp,gftp} --release --features static-openssl &&
-              aarch64-linux-musl-strip -x target/aarch64-unknown-linux-musl/release/{yagna,ya-provider,exe-unit,golemsp,gftp}
-            "
+            -p yagna
+            -p ya-exe-unit
+            -p ya-provider
+            -p golemsp
+            -p gftp
+            --release
+            --features static-openssl
+            --target aarch64-unknown-linux-musl
 
       - name: Pack
         id: pack

diff --git a/.github/workflows/rust-aarch64.yml b/.github/workflows/rust-aarch64.yml
@@ -13,21 +13,35 @@ on:
 jobs:
   build:
     name: Build
+    env:
+      RUSTFLAGS: "-C link-arg=-s"
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v2
 
+      - name: Setup toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          target: aarch64-unknown-linux-musl
+          override: true
+
       - name: Build binaries
-        uses: docker://golemfactory/build-aarch64:0.1.1
+        uses: actions-rs/cargo@v1
         with:
-          workdir: /github/workspace
+          use-cross: true
+          command: build
           args: >
-            /bin/bash -c "
-              export HOME=/root &&
-              cargo build -p={yagna,ya-exe-unit,ya-provider,golemsp,gftp} --release --features static-openssl &&
-              aarch64-linux-musl-strip -x target/aarch64-unknown-linux-musl/release/{yagna,ya-provider,exe-unit,golemsp,gftp}
-            "
+            -p yagna
+            -p ya-exe-unit
+            -p ya-provider
+            -p golemsp
+            -p gftp
+            --release
+            --features static-openssl
+            --target aarch64-unknown-linux-musl
+
       - name: Copy binaries
         shell: bash
         run: |