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

Amend changes to wasmer init #3432

Merged
merged 27 commits into from
Dec 21, 2022
Merged

Amend changes to wasmer init #3432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
e1c42b5
Revert "Revert "Implement wasmer init and wasmer publish""
fschutt Dec 16, 2022
46a2d28
Remove client-side validation when uploading package
fschutt Dec 16, 2022
e28e3af
Remove build-wapm, package-wapm and get-wapm steps from Makefile
fschutt Dec 16, 2022
964b897
Remove build-wapm from build.yml
fschutt Dec 16, 2022
adafb28
Add warning when initializing a wasmer.toml file from a Cargo.toml
fschutt Dec 16, 2022
dd470ad
Amend note for warning about Cargo metadata
fschutt Dec 16, 2022
c29377f
Rename wapm.sqlite -> wasmer.sqlite
fschutt Dec 16, 2022
c69a754
Remove unnecessary fixture .toml files
fschutt Dec 16, 2022
8e865a2
Remove Package::validate_package_name
fschutt Dec 16, 2022
51a518a
Rename wapm_toml variables to wasmer_toml, prefer wasmer.toml
fschutt Dec 18, 2022
5e19f0a
Change wapm.toml to wasmer.toml with fallback
fschutt Dec 18, 2022
3f2adc4
Fix raw reads to wapm.toml to use LocalPackage::read_toml
fschutt Dec 18, 2022
02fc047
Migrate from wapm-toml to wasmer-toml
fschutt Dec 19, 2022
5700cbf
Add wasmer_dir to WasmerConfig::from_file
fschutt Dec 20, 2022
96c8fd8
More formatting: PartialWapmConfig::from_file
fschutt Dec 20, 2022
7cefc4a
More refactoring: test_name -> wasmer_dir
fschutt Dec 20, 2022
fc280cc
Fix remaining compilation errors regarding wasmer_url
fschutt Dec 20, 2022
f9bc2d9
Return error on fs::create_dir_all failing
fschutt Dec 20, 2022
e06e5a9
Use PathBuf::from(string)
fschutt Dec 20, 2022
117c9a3
Rework switching between --bin, --lib and --empty
fschutt Dec 20, 2022
b26c73e
Use anyhow .with_context
fschutt Dec 20, 2022
896cf0d
Make SignArchiveResult::Ok clearer
fschutt Dec 20, 2022
96f1416
Bubble error on .tar.gz build failure
fschutt Dec 20, 2022
e9ceff9
Use MIGRATIONS.len() and fix compile errors
fschutt Dec 20, 2022
5f2830c
Merge branch 'master' into init-2
fschutt Dec 20, 2022
b24025a
cargo clippy --fix --all
fschutt Dec 20, 2022
b6214d8
Merge branch 'master' into init-2
fschutt Dec 21, 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
3 changes: 0 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,9 +213,6 @@ jobs:
# shell: bash
# run: |
# make build-wasmer-wasm
- name: Build Wapm binary
run: |
make build-wapm
- name: Install Nightly Rust for Headless
uses: dtolnay/rust-toolchain@nightly
with:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/cloudcompiler.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
make build-wasmer-wasm &&
mkdir target/wasm32-wasi/release/cloudcompiler
cp target/wasm32-wasi/release/wasmer-compiler.wasm target/wasm32-wasi/release/cloudcompiler/cloudcompiler.wasm &&
cat << EOF > target/wasm32-wasi/release/cloudcompiler/wapm.toml
cat << EOF > target/wasm32-wasi/release/cloudcompiler/wasmer.toml
[package]
name = "${{ secrets.WAPM_DEV_USERNAME }}/cloudcompiler"
version = "0.1.0"
Expand All @@ -55,17 +55,17 @@ jobs:
name = "cloudcompiler"
module = "cloudcompiler"
EOF
- name: Fix wapm.toml version
- name: Fix wasmer.toml version
run: |
echo $(git tag | tail -n1) > ./version.txt
v=$(git describe --tags --abbrev=0) && \
echo "version = ${v}" &&
sed -i "s/version = \".*\"/version = \"${v}\"/g" target/wasm32-wasi/release/cloudcompiler/wapm.toml \
sed -i "s/version = \".*\"/version = \"${v}\"/g" target/wasm32-wasi/release/cloudcompiler/wasmer.toml \
- name: Build cloudcompiler.wasm
shell: bash
run: |
git tag &&
cat target/wasm32-wasi/release/cloudcompiler/wapm.toml &&
cat target/wasm32-wasi/release/cloudcompiler/wasmer.toml &&
echo "ls" &&
ls target/wasm32-wasi/release/cloudcompiler
- name: Publish to WAPM
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ api-docs-repo/
/src/windows-installer/WasmerInstaller.exe
/lib/c-api/wasmer.h
.xwin-cache
wapm.toml
wasmer.toml
# Generated by tests on Android
/avd
/core
Expand Down
Loading