use jobs from test.yaml

wasmerio · Oct 18, 2024 · a76eac0 · a76eac0
1 parent e5e0e10
commit a76eac0
Showing 1 changed file with 47 additions and 59 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -527,43 +527,36 @@ jobs:
 
   linux_aarch64:
     name: Linux aarch64
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        build-what: [
+          {
+            key: capi,
+            build-cmd: 'make build-wasmer &&  make package-capi-headless && make build-capi && make package-capi',
+            name: 'Build C-API'
+          },
+          {
+            key: wasmer,
+            build-cmd: 'make build-wasmer && make package-wasmer && make tar-wasmer',
+            name: 'Build wasmer-cli'
+          }
+        ]
     steps:
       - uses: actions/checkout@v3
       - uses: dtolnay/rust-toolchain@stable
         with:
+          toolchain: ${{ env.MSRV }}
           target: aarch64-unknown-linux-gnu
       - name: Build cross image
         run: |
           docker build -t wasmer/aarch64 ${GITHUB_WORKSPACE}/.github/cross-linux-aarch64/
         env:
           CROSS_DOCKER_IN_DOCKER: true
-      - name: Build Wasmer binary
-        run: |
-          make build-wasmer
-        env:
-          CARGO_BINARY: docker run -v /var/run/docker.sock:/var/run/docker.sock -v ${GITHUB_WORKSPACE}:/project -w /project wasmer/aarch64 cross
-          CROSS_DOCKER_IN_DOCKER: true
-          CARGO_TARGET: aarch64-unknown-linux-gnu
-          PKG_CONFIG_PATH: /usr/lib/aarch64-linux-gnu/pkgconfig
-          PKG_CONFIG_ALLOW_CROSS: true
-          ENABLE_LLVM: 0
-      - name: Build C API headless
-        shell: bash
-        run: |
-          make package-capi-headless
-        env:
-          CARGO_BINARY: docker run -v /var/run/docker.sock:/var/run/docker.sock -v ${GITHUB_WORKSPACE}:/project -w /project wasmer/aarch64 cross
-          CROSS_DOCKER_IN_DOCKER: true
-          CARGO_TARGET: aarch64-unknown-linux-gnu
-          PKG_CONFIG_PATH: /usr/lib/aarch64-linux-gnu/pkgconfig
-          PKG_CONFIG_ALLOW_CROSS: true
-          ENABLE_LLVM: 0
-          TARGET: aarch64-unknown-linux-gnu
-          TARGET_DIR: target/aarch64-unknown-linux-gnu/release
-      - name: Build C API
+      - name: Build ${{ matrix.build-what.key }}
         run: |
-          make build-capi
+          ${{ matrix.build-what.build-cmd }}
         env:
           CARGO_BINARY: docker run -v /var/run/docker.sock:/var/run/docker.sock -v ${GITHUB_WORKSPACE}:/project -w /project wasmer/aarch64 cross
           CROSS_DOCKER_IN_DOCKER: true
@@ -572,6 +565,7 @@ jobs:
           PKG_CONFIG_ALLOW_CROSS: true
           ENABLE_LLVM: 0
       - name: Dist
+        if: ${{ matrix.build-what.key == 'capi' }}
         run: |
           make distribution
         env:
@@ -583,6 +577,7 @@ jobs:
           TARGET: aarch64-unknown-linux-gnu
           TARGET_DIR: target/aarch64-unknown-linux-gnu/release
       - name: Upload Artifacts
+        if: ${{ matrix.build-what.key == 'capi' }}
         uses: actions/upload-artifact@v4
         with:
           name: wasmer-linux-aarch64
@@ -592,62 +587,55 @@ jobs:
 
   linux_riscv64:
     name: Linux riscv64
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        build-what: [
+          {
+            key: capi,
+            build-cmd: 'make build-wasmer &&  make package-capi-headless && make build-capi && make package-capi',
+            name: 'Build C-API'
+          },
+          {
+            key: wasmer,
+            build-cmd: 'make build-wasmer && make package-wasmer && make tar-wasmer',
+            name: 'Build wasmer-cli'
+          }
+        ]
     steps:
       - uses: actions/checkout@v3
-      - uses: dtolnay/rust-toolchain@stable
-        with:
-          target: riscv64gc-unknown-linux-gnu
+      #- uses: dtolnay/rust-toolchain@stable
+      #  with:
+      #    toolchain: ${{ env.MSRV }}
+      #    target: riscv64gc-unknown-linux-gnu
       - name: Build cross image
         run: |
           docker build -t wasmer/riscv64 ${GITHUB_WORKSPACE}/.github/cross-linux-riscv64/
         env:
           CROSS_DOCKER_IN_DOCKER: true
-      - name: Build Wasmer binary
+      - name: Build ${{ matrix.build-what.key }}
         run: |
-          make build-wasmer
+          ${{ matrix.build-what.build-cmd }}
         env:
-          CARGO_BINARY: docker run -v /var/run/docker.sock:/var/run/docker.sock -v ${GITHUB_WORKSPACE}:/project -w /project wasmer/riscv64:latest cargo
+          CARGO_BINARY: docker run -v /var/run/docker.sock:/var/run/docker.sock -v ${GITHUB_WORKSPACE}:/project -w /project wasmer/riscv64 cargo
           CROSS_DOCKER_IN_DOCKER: true
           CARGO_TARGET: riscv64gc-unknown-linux-gnu
-          PKG_CONFIG_PATH: /usr/lib/riscv64-linux-gnu/pkgconfig
-          PKG_CONFIG_ALLOW_CROSS: true
-          ENABLE_LLVM: 0
-      - name: Build C API headless
-        shell: bash
-        run: |
-          make package-capi-headless
-        env:
-          CARGO_BINARY: docker run -v /var/run/docker.sock:/var/run/docker.sock -v ${GITHUB_WORKSPACE}:/project -w /project wasmer/riscv64:latest cargo
-          CROSS_DOCKER_IN_DOCKER: true
-          CARGO_TARGET: riscv64gc-unknown-linux-gnu
-          PKG_CONFIG_PATH: /usr/lib/riscv64-linux-gnu/pkgconfig
-          PKG_CONFIG_ALLOW_CROSS: true
-          ENABLE_LLVM: 0
-          TARGET: riscv64gc-unknown-linux-gnu
-          TARGET_DIR: target/riscv64gc-unknown-linux-gnu/release
-      - name: Build C API
-        run: |
-          make build-capi
-        env:
-          CARGO_BINARY: docker run -v /var/run/docker.sock:/var/run/docker.sock -v ${GITHUB_WORKSPACE}:/project -w /project wasmer/riscv64:latest cargo
-          CROSS_DOCKER_IN_DOCKER: true
-          CARGO_TARGET: riscv64gc-unknown-linux-gnu
-          PKG_CONFIG_PATH: /usr/lib/riscv64-linux-gnu/pkgconfig
-          PKG_CONFIG_ALLOW_CROSS: true
           ENABLE_LLVM: 0
       - name: Dist
+        if: ${{ matrix.build-what.key == 'capi' }}
         run: |
           make distribution
         env:
-          CARGO_BINARY: docker run -v /var/run/docker.sock:/var/run/docker.sock -v ${GITHUB_WORKSPACE}:/project -w /project wasmer/riscv64:latest cargo
+          CARGO_BINARY: docker run -v /var/run/docker.sock:/var/run/docker.sock -v ${GITHUB_WORKSPACE}:/project -w /project wasmer/riscv64 cargo
           CROSS_DOCKER_IN_DOCKER: true
           CARGO_TARGET: riscv64gc-unknown-linux-gnu
           PKG_CONFIG_PATH: /usr/lib/riscv64-linux-gnu/pkgconfig
           PKG_CONFIG_ALLOW_CROSS: true
           TARGET: riscv64gc-unknown-linux-gnu
           TARGET_DIR: target/riscv64gc-unknown-linux-gnu/release
       - name: Upload Artifacts
+        if: ${{ matrix.build-what.key == 'capi' }}
         uses: actions/upload-artifact@v4
         with:
           name: wasmer-linux-riscv64