Skip to content

Commit

Permalink
Added more commands to install
Browse files Browse the repository at this point in the history
  • Loading branch information
syrusakbary committed Apr 11, 2019
1 parent e5d0b37 commit e31d461
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 26 deletions.
48 changes: 24 additions & 24 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,10 @@ jobs:
- image: circleci/rust:latest
steps:
- checkout
# - run:
# name: "Pull dependencies"
# command: |
# git clone [email protected]:wasmerio/wapm-cli.git
- run:
name: "Pull dependencies"
command: |
git clone [email protected]:wasmerio/wapm-cli.git
- restore_cache:
keys:
- v8-cargo-cache-linux-nightly-{{ arch }}-{{ checksum "Cargo.lock" }}
Expand Down Expand Up @@ -174,7 +174,7 @@ jobs:
command: |
export LLVM_SYS_70_PREFIX="`pwd`/clang+llvm-7.0.0-x86_64-linux-gnu-ubuntu-16.04/"
make release
# cargo build --release --manifest-path wapm-cli/Cargo.toml
cargo build --release --manifest-path wapm-cli/Cargo.toml
mkdir -p artifacts
VERSION=$(cargo pkgid | cut -d# -f2 | cut -d: -f2)
# GIT_VERSION=$(git describe --exact-match --tags)
Expand All @@ -199,20 +199,20 @@ jobs:
- target/release/.fingerprint
- target/release/build
- target/release/deps
# - wapm-cli/target/release/.fingerprint
# - wapm-cli/target/release/build
# - wapm-cli/target/release/deps
- wapm-cli/target/release/.fingerprint
- wapm-cli/target/release/build
- wapm-cli/target/release/deps
key: v8-cargo-cache-linux-nightly-{{ arch }}-{{ checksum "Cargo.lock" }}

test-and-build-macos:
macos:
xcode: "9.0"
steps:
- checkout
# - run:
# name: "Pull dependencies"
# command: |
# git clone [email protected]:wasmerio/wapm-cli.git
- run:
name: "Pull dependencies"
command: |
git clone [email protected]:wasmerio/wapm-cli.git
- restore_cache:
keys:
- v8-cargo-cache-darwin-nightly-{{ arch }}-{{ checksum "Cargo.lock" }}
Expand Down Expand Up @@ -263,7 +263,7 @@ jobs:
export PATH="$HOME/.cargo/bin:$PATH"
export LLVM_SYS_70_PREFIX="`pwd`/clang+llvm-7.0.0-x86_64-apple-darwin/"
make release
# cargo build --release --manifest-path wapm-cli/Cargo.toml
cargo build --release --manifest-path wapm-cli/Cargo.toml
mkdir -p artifacts
make build-install
cp ./wasmer.tar.gz ./artifacts/$(./binary-name.sh)
Expand All @@ -282,9 +282,9 @@ jobs:
- target/release/.fingerprint
- target/release/build
- target/release/deps
# - wapm-cli/target/release/.fingerprint
# - wapm-cli/target/release/build
# - wapm-cli/target/release/deps
- wapm-cli/target/release/.fingerprint
- wapm-cli/target/release/build
- wapm-cli/target/release/deps
key: v8-cargo-cache-darwin-nightly-{ arch }}-{{ checksum "Cargo.lock" }}

test-rust-nightly:
Expand Down Expand Up @@ -337,7 +337,7 @@ jobs:
# VERSION_TAG=$(git describe --exact-match --tags)
#if [ "$VERSION" == "$VERSION_TAG" ]; then
# echo "Versions match, publishing to Github"
ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -soft ${VERSION} ./artifacts/
ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -replace ${VERSION} ./artifacts/
#else
# echo "Versions don't match. Wasmer output version (wasmer --version) is ${VERSION} while Git tag is ${VERSION_TAG}"
# exit 1
Expand Down Expand Up @@ -400,10 +400,10 @@ workflows:
filters:
branches:
only: master
- trigger-benchmark-build:
requires:
- test-and-build
- lint
filters:
branches:
only: master
# - trigger-benchmark-build:
# requires:
# - test-and-build
# - lint
# filters:
# branches:
# only: master
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ precommit: lint test

build-install:
mkdir -p ./install/bin
# cp ./wapm-cli/target/release/wapm ./install/bin/
cp ./wapm-cli/target/release/wapm ./install/bin/
cp ./target/release/wasmer ./install/bin/
tar -C ./install -zcvf wasmer.tar.gz bin/wapm bin/wasmer

Expand Down
2 changes: 1 addition & 1 deletion install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ bold="\e[1m"
dim="\e[2m"

# Warning: Remove this on the public repo
RELEASES_URL="https://github.com/wasmerio/wasmer/releases"
RELEASES_URL="https://github.com/oimpaw/wasmer/releases"

wasmer_download_json() {
url="$2"
Expand Down

0 comments on commit e31d461

Please sign in to comment.