Skip to content

Commit

Permalink
Merge #390
Browse files Browse the repository at this point in the history
390: pin wapm version r=xmclark 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>
  • Loading branch information
bors[bot] and xmclark committed Apr 23, 2019
2 parents 64034f4 + b1ece9d commit c86c137
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
10 changes: 6 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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" }}
Expand Down Expand Up @@ -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" }}
Expand All @@ -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)
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "wapm-cli"]
path = wapm-cli
url = git@github.com:wasmerio/wapm-cli.git
1 change: 1 addition & 0 deletions wapm-cli
Submodule wapm-cli added at c9399f

0 comments on commit c86c137

Please sign in to comment.