Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate pirita / native executables feature from wasmer-private #3258

Merged
merged 50 commits into from
Nov 2, 2022
+3,349 −365
Merged

Migrate pirita / native executables feature from wasmer-private #3258

Show file tree
Hide file tree
Changes from 44 commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
1e2617c
Add feature=pirita_file
fschutt Oct 26, 2022
e8977ed
cargo clippy --fix
fschutt Oct 26, 2022
c4bf4e1
Fix cargo clippy
fschutt Oct 27, 2022
705dc8f
Compilation with make-wasmer-pirita now works
fschutt Oct 27, 2022
48cdaf3
Add python.wasmer
fschutt Oct 27, 2022
f7c647a
Add support for WASI args, add integration test for run pirita
fschutt Oct 27, 2022
2109f0f
Add integration test for create-exe
fschutt Oct 27, 2022
968d74c
Add webc-vfs
fschutt Oct 27, 2022
acc5ac1
Add WasiRunner and EmscriptenRunner
fschutt Oct 27, 2022
ba68952
Update Cargo.lock
fschutt Oct 27, 2022
afdffbe
cargo fmt
fschutt Oct 27, 2022
87aa82f
cargo fmt
fschutt Oct 27, 2022
6d404de
Move runners into wasmer/api crate
fschutt Oct 27, 2022
7e76db8
Fixed most dependency errors
fschutt Oct 27, 2022
d2d3b4e
Remove .cargo/config
fschutt Oct 27, 2022
a0d9248
Move /runners into wasmer-wasi
fschutt Oct 28, 2022
a3f833f
Fix compilation bugs with webc
fschutt Oct 28, 2022
cf3ab70
cargo fmt
fschutt Oct 28, 2022
178f469
Fix make lint
fschutt Oct 28, 2022
ad1f72a
Merge branch 'master' into migrate-wasmer-private
fschutt Oct 28, 2022
acdf8f5
Fix doctest, add execution to integration test
fschutt Oct 28, 2022
37f88c9
Fix cargo deny
fschutt Oct 28, 2022
5c941b3
Fix integration test to zip a tarball from the /package directory
fschutt Oct 28, 2022
86ef576
Added function to auto-download and install zig when cross-compiling
fschutt Oct 28, 2022
fde919f
Fixed CI not running integration tests
fschutt Oct 29, 2022
5160cb5
Fix "wasmer_static_module_new" function
fschutt Nov 1, 2022
51ae0b6
Merge branch 'master' into migrate-wasmer-private
fschutt Nov 1, 2022
84feb95
Fix bug in wasmer_module_new
fschutt Nov 1, 2022
d6fb6a1
Fix error in make package not running
fschutt Nov 1, 2022
eb7f14a
Rename wasmer_module_new -> wasmer_object_module_new
fschutt Nov 1, 2022
ad7937e
Remove check to prevent both wasi and emscripten imports
fschutt Nov 1, 2022
f738e6d
Added more debugging for wasmer test
fschutt Nov 1, 2022
de7b451
Move test-integration-cli step to front of queue
fschutt Nov 1, 2022
b7cc838
Set the current directory for integration tests
fschutt Nov 1, 2022
a7309c0
Try to fix unit test again
fschutt Nov 1, 2022
81974bf
Fix get_repo_root_path
fschutt Nov 1, 2022
430ed72
Implemented maximum level of root dir depth to prevent infinite loop
fschutt Nov 1, 2022
1061360
Add debugging to see why the CI isn't working
fschutt Nov 2, 2022
786e273
Fix get_repo_root_path function
fschutt Nov 2, 2022
9ae02d5
Remove debugging println
fschutt Nov 2, 2022
6d61514
Enable running integration tests on Windows
fschutt Nov 2, 2022
5bf9c69
Debug libwasmer path not found
fschutt Nov 2, 2022
71be0ae
Use bash on Windows for running scripts
fschutt Nov 2, 2022
f7ad826
Add explicit target to window integration tests
fschutt Nov 2, 2022
907a734
Remove nuke-dir dependency
fschutt Nov 2, 2022
2c93fcb
Try to fix CI error on Windows
fschutt Nov 2, 2022
8288ef5
Ignore create-exe test on linux-musl (see #3271)
fschutt Nov 2, 2022
ebb8e74
Run "make build-wasmer" before "make package"
fschutt Nov 2, 2022
c00113a
Add build-wasmer to make test-integration-cli step
fschutt Nov 2, 2022
f00a59a
Remove println
fschutt Nov 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
32 changes: 22 additions & 10 deletions .github/workflows/test-sys.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-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-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: |
Expand All @@ -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
Expand Down
Loading