Merge #3258

3258: Migrate pirita / native executables feature from wasmer-private r=fschutt a=fschutt Co-authored-by: Felix Schütt <[email protected]> Co-authored-by: Felix Schütt <[email protected]>
wasmerio · Nov 2, 2022 · 08f47a3 · 08f47a3
2 parents c84357d + f00a59a
commit 08f47a3
Show file tree

Hide file tree

Showing 34 changed files with 3,349 additions and 365 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -87,6 +87,9 @@ jobs:
       TARGET: ${{ matrix.target }}
     steps:
       - uses: actions/checkout@v3
+      - uses: webfactory/[email protected]
+        with:
+            ssh-private-key: ${{ secrets.PIRITA_SSH_PRIVATE_KEY }}
       - name: Set up libstdc++ on Linux
         if: matrix.build == 'linux-x64'
         run: |
@@ -275,14 +278,14 @@ jobs:
           target: aarch64-unknown-linux-gnu
       - name: Build cross image
         run: |
-          docker build -t wasmer/aarch64 /home/runner/work/wasmer/wasmer/.github/cross-linux-aarch64/
+          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 /home/runner/work/wasmer/wasmer:/project -w /project wasmer/aarch64 cross
+          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: --target aarch64-unknown-linux-gnu
           PKG_CONFIG_PATH: /usr/lib/aarch64-linux-gnu/pkgconfig
@@ -293,7 +296,7 @@ jobs:
         run: |
           make package-capi-headless
         env:
-          CARGO_BINARY: docker run -v /var/run/docker.sock:/var/run/docker.sock -v /home/runner/work/wasmer/wasmer:/project -w /project wasmer/aarch64 cross
+          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: --target aarch64-unknown-linux-gnu
           PKG_CONFIG_PATH: /usr/lib/aarch64-linux-gnu/pkgconfig
@@ -305,7 +308,7 @@ jobs:
         run: |
           make build-capi
         env:
-          CARGO_BINARY: docker run -v /var/run/docker.sock:/var/run/docker.sock -v /home/runner/work/wasmer/wasmer:/project -w /project wasmer/aarch64 cross
+          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: --target aarch64-unknown-linux-gnu
           PKG_CONFIG_PATH: /usr/lib/aarch64-linux-gnu/pkgconfig
@@ -315,7 +318,7 @@ jobs:
         run: |
           make distribution
         env:
-          CARGO_BINARY: docker run -v /var/run/docker.sock:/var/run/docker.sock -v /home/runner/work/wasmer/wasmer:/project -w /project wasmer/aarch64 cross
+          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: --target aarch64-unknown-linux-gnu
           PKG_CONFIG_PATH: /usr/lib/aarch64-linux-gnu/pkgconfig

diff --git a/.github/workflows/test-sys.yaml b/.github/workflows/test-sys.yaml
@@ -199,6 +199,28 @@ jobs:
           '${{ runner.tool_cache }}/cargo-sccache/bin/sccache' -s
           echo 'RUSTC_WRAPPER=${{ runner.tool_cache }}/cargo-sccache/bin/sccache' >> $GITHUB_ENV
         shell: bash
+      - name: Test integration CLI
+        if: matrix.run_test && matrix.os != 'windows-2019'
+        shell: bash
+        run: |
+          make && make build-wasmer && make build-capi && make package-capi && make package
+          export WASMER_DIR=`pwd`/package
+          make test-integration-cli
+        env:
+          TARGET: ${{ matrix.target }}
+          TARGET_DIR: target/${{ matrix.target }}/release
+          CARGO_TARGET: --target ${{ matrix.target }}
+      - name: Test integration CLI
+        if: matrix.run_test && matrix.os == 'windows-2019'
+        shell: bash
+        run: |
+          make && make build-wasmer && make build-capi && make package-capi && make package
+          export WASMER_DIR=`pwd`/package
+          make test-integration-cli
+        env:
+          TARGET: ${{ matrix.target }}
+          TARGET_DIR: target/${{ matrix.target }}/release
+          CARGO_TARGET: --target x86_64-pc-windows-msvc
       - name: Test
         if: matrix.run_test && matrix.os != 'windows-2019'
         run: |
@@ -223,16 +245,6 @@ jobs:
           TARGET: ${{ matrix.target }}
           TARGET_DIR: target/${{ matrix.target }}/release
           CARGO_TARGET: --target ${{ matrix.target }}
-      - name: Test integration CLI
-        if: matrix.run_test && matrix.os != 'windows-2019'
-        run: |
-          make && make build-capi && make package-capi && make package
-          export WASMER_DIR=`pwd`/package
-          make test-integration-cli
-        env:
-          TARGET: ${{ matrix.target }}
-          TARGET_DIR: target/${{ matrix.target }}/release
-          CARGO_TARGET: --target ${{ matrix.target }}
       - name: Test
         if: matrix.run_test && matrix.os == 'windows-2019'
         shell: bash