From f2130fc2271329909267fbce8d1ee14a5dd9447a Mon Sep 17 00:00:00 2001 From: Mackenzie Clark Date: Tue, 23 Apr 2019 12:06:55 -0700 Subject: [PATCH 1/7] pin wapm version --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 831abb9568b..9be02af8d59 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -153,7 +153,7 @@ jobs: - run: name: "Pull dependencies" command: | - git clone git@github.com:wasmerio/wapm-cli.git + git clone --branch v0.1.0 --depth 1 https://github.com/wasmerio/wapm-cli - restore_cache: keys: - v8-cargo-cache-linux-nightly-{{ arch }}-{{ checksum "Cargo.lock" }} From f372fddb9e2fc6d0bf46e203bcf843b41152d69c Mon Sep 17 00:00:00 2001 From: Mackenzie Clark Date: Tue, 23 Apr 2019 12:59:55 -0700 Subject: [PATCH 2/7] add wapm-cli as git submodule at the v0.1.0 tag commit --- .gitmodules | 3 +++ wapm-cli | 1 + 2 files changed, 4 insertions(+) create mode 100644 .gitmodules create mode 160000 wapm-cli diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000000..ea4c03efb99 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "wapm-cli"] + path = wapm-cli + url = git@github.com:wasmerio/wapm-cli.git diff --git a/wapm-cli b/wapm-cli new file mode 160000 index 00000000000..c9399f3fb11 --- /dev/null +++ b/wapm-cli @@ -0,0 +1 @@ +Subproject commit c9399f3fb117c8ab1cbaf17b02bd5aeefb8e8e54 From 5881f5468280a69fb114f033f429c8f2ad7a2e85 Mon Sep 17 00:00:00 2001 From: Mackenzie Clark Date: Tue, 23 Apr 2019 12:06:55 -0700 Subject: [PATCH 3/7] Revert "pin wapm version" This reverts commit f2130fc2271329909267fbce8d1ee14a5dd9447a. --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9be02af8d59..831abb9568b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -153,7 +153,7 @@ jobs: - run: name: "Pull dependencies" command: | - git clone --branch v0.1.0 --depth 1 https://github.com/wasmerio/wapm-cli + git clone git@github.com:wasmerio/wapm-cli.git - restore_cache: keys: - v8-cargo-cache-linux-nightly-{{ arch }}-{{ checksum "Cargo.lock" }} From 7494e2c8f2a88ad54c61d6f3728b00c063f2845a Mon Sep 17 00:00:00 2001 From: Mackenzie Clark Date: Tue, 23 Apr 2019 13:04:12 -0700 Subject: [PATCH 4/7] update config to update the new git submodule --- .circleci/config.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 831abb9568b..72b83a36a3a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -153,7 +153,8 @@ jobs: - run: name: "Pull dependencies" command: | - git clone git@github.com:wasmerio/wapm-cli.git + git submodule init + git submodule update --remote - restore_cache: keys: - v8-cargo-cache-linux-nightly-{{ arch }}-{{ checksum "Cargo.lock" }} @@ -220,7 +221,8 @@ jobs: - run: name: "Pull dependencies" command: | - git clone git@github.com:wasmerio/wapm-cli.git + git submodule init + git submodule update --remote - restore_cache: keys: - v8-cargo-cache-darwin-nightly-{{ arch }}-{{ checksum "Cargo.lock" }} From 24d5d2d8a7ff745a43bc7d4644c639a120435522 Mon Sep 17 00:00:00 2001 From: Mackenzie Clark Date: Tue, 23 Apr 2019 13:43:40 -0700 Subject: [PATCH 5/7] install rust with new https curl --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 72b83a36a3a..4d0722cfb8b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -240,7 +240,7 @@ jobs: - run: name: Install Rust command: | - curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly-2019-04-11 + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly export PATH="$HOME/.cargo/bin:$PATH" cargo --version # Use rust nightly (for singlepass, for now) From b1ece9dc41aa52d61113ec2da00639068082f35f Mon Sep 17 00:00:00 2001 From: Mackenzie Clark Date: Tue, 23 Apr 2019 13:53:48 -0700 Subject: [PATCH 6/7] add the other correct usage of rustup install --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4d0722cfb8b..49d8b10d505 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -103,7 +103,7 @@ jobs: - run: name: Install Rust command: | - curl https://sh.rustup.rs -sSf | sh -s -- -y + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly export PATH="$HOME/.cargo/bin:$PATH" cargo --version - run: From 6ff24a8aa18eb809d1e887f2554ed4a864e46654 Mon Sep 17 00:00:00 2001 From: Mark McCaskey Date: Thu, 25 Apr 2019 11:01:46 -0700 Subject: [PATCH 7/7] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c4deaceb2ad..1a2fc7739c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ All PRs to the Wasmer repository must add to this file. Blocks of changes will separated by version increments. ## **[Unreleased]** +- [#390](https://github.com/wasmerio/wasmer/pull/390) Pin released wapm version and add it as a git submodule - [#383](https://github.com/wasmerio/wasmer/pull/383) Hook up wasi exit code to wasmer cli. - [#382](https://github.com/wasmerio/wasmer/pull/382) Improve error message on `--backend` flag to only suggest currently enabled backends - [#381](https://github.com/wasmerio/wasmer/pull/381) Allow retrieving propagated user errors.