Merge #390

390: pin wapm version r=MarkMcCaskey a=xmclark

This PR pins the version of wapm-cli that gets distributed during releases. We can re-create the release, and will always install the same version of wapm-cli (until we update on a new wapm-cli release). 

Co-authored-by: Mackenzie Clark <mackenzie.a.z.c@gmail.com>
Co-authored-by: Mark McCaskey <markmccaskey@users.noreply.github.com>

.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:
@@ -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" }}
@@ -238,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)

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "wapm-cli"]
+	path = wapm-cli
+	url = git@github.com:wasmerio/wapm-cli.git

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.