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

Updated Windows Wasmer icons. Add wax #1286

Merged
merged 7 commits into from
Mar 11, 2020
Merged

Updated Windows Wasmer icons. Add wax #1286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4b99a41
Added support for wapm wax
syrusakbary Mar 6, 2020
d1f79ae
Fixed comments
syrusakbary Mar 6, 2020
bd9aae1
Updated Wasmer icons
syrusakbary Mar 6, 2020
a1cdeed
Update CHANGELOG.md
syrusakbary Mar 10, 2020
cce134d
Merge branch 'master' into wapm-wax
syrusakbary Mar 10, 2020
f2c5f88
Added wax symlink
syrusakbary Mar 11, 2020
a4a90df
Fixed WAPM version
syrusakbary Mar 11, 2020
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## **[Unreleased]**

- [#1286](https://github.com/wasmerio/wasmer/pull/1286) Updated Windows Wasmer icons. Add wax
- [#1284](https://github.com/wasmerio/wasmer/pull/1284) Implement string and memory instructions in `wasmer-interface-types`
- [#1272](https://github.com/wasmerio/wasmer/pull/1272) Fix off-by-one error bug when accessing memory with a `WasmPtr` that contains the last valid byte of memory. Also changes the behavior of `WasmPtr<T, Array>` with a length of 0 and `WasmPtr<T>` where `std::mem::size_of::<T>()` is 0 to always return `None`

Expand Down
4 changes: 3 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,8 @@ build-install-package:
mkdir -p ./install/bin
cp ./wapm-cli/target/release/wapm ./install/bin/
cp ./target/release/wasmer ./install/bin/
# Create the wax binary as symlink to wapm
cd ./install/bin/ && ln -s wapm wax
tar -C ./install -zcvf wasmer.tar.gz bin/wapm bin/wasmer
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Swinging by to check out wax and finding it missing in the release tarballs. Should bin/wax be added to the list here?

If I manually run ln -s $HOME/.wasmer/bin/wapm $HOME/.wasmer/bin/wax, the wax command works for me locally after installing via curl

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for letting us know! I'm looking into this now

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We had a retro on our release process and will be making some changes to reduce the chance of something like this happening again. Thanks again for reporting this and verifying that it was working on your end after we shipped the fix!

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here's the link to our retro where we analyzed the issues during the release process:

https://www.notion.so/wasmer/March-12-Release-Retrospective-2a5d1b79005f43fe9ee6a035cf0b5921

Thanks for the ping @lmorchard!


UNAME_S := $(shell uname -s)
Expand Down Expand Up @@ -315,7 +317,7 @@ endif
cp lib/runtime-c-api/doc/index.md ./capi/README.md
tar -C ./capi -zcvf wasmer-c-api.tar.gz lib include README.md LICENSE

WAPM_VERSION = 0.4.3
WAPM_VERSION = v0.5.0
build-wapm:
git clone --branch $(WAPM_VERSION) https://github.com/wasmerio/wapm-cli.git
cargo build --release --manifest-path wapm-cli/Cargo.toml --features "telemetry update-notifications"
Expand Down
Binary file modified src/installer/media/wizard_logo.ico
View file
Open in desktop
Binary file not shown.
Binary file modified src/installer/media/wizard_logo_2.bmp
View file
Open in desktop
Binary file not shown.
Binary file modified src/installer/media/wizard_logo_small.bmp
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions src/installer/wasmer.iss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ Root: HKCU; Subkey: "Environment"; ValueType:string; ValueName: "WASMER_CACHE_DI
[Files]
Source: "..\..\target\release\wasmer.exe"; DestDir: "{app}\bin"
Source: "..\..\wapm-cli\target\release\wapm.exe"; DestDir: "{app}\bin"
Source: "wax.cmd"; DestDir: "{app}\bin"

[Dirs]
Name: "{%USERPROFILE}\.wasmer"
Expand Down
2 changes: 2 additions & 0 deletions src/installer/wax.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@echo off
wapm.exe execute %*