Skip to content

Commit

Permalink
node versions now specified in env
Browse files Browse the repository at this point in the history
  • Loading branch information
chearon committed Nov 4, 2018
1 parent c6493c3 commit e6d0160
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,14 @@ install:
-e PREBUILD_VERSION="$PREBUILD_VERSION"
-e PREBUILD_AUTH="$PREBUILD_AUTH"
-e PREBUILD_SLUG="$TRAVIS_REPO_SLUG"
-e PREBUILD_NODE_VERSIONS="$PREBUILD_NODE_VERSIONS"
-v $(pwd):/build chearon/canvas-prebuilt:5
bash -c 'cd /build; export NVM_DIR=$HOME/.nvm; . $HOME/.nvm/nvm.sh; . ci/install.sh linux '"\"$PREBUILD_VERSION\" \"$PREBUILD_CANVAS_VERSION\"";
bash -c 'cd /build; export NVM_DIR=$HOME/.nvm; . $HOME/.nvm/nvm.sh; . ci/install.sh linux '"\"$PREBUILD_VERSION\" \"$PREBUILD_CANVAS_VERSION\" \"$PREBUILD_NODE_VERSIONS\"";
else
export PREBUILD_SLUG="$TRAVIS_REPO_SLUG";
bash ci/install.sh osx "$PREBUILD_VERSION" "$PREBUILD_CANVAS_VERSION";
bash ci/install.sh osx "$PREBUILD_VERSION" "$PREBUILD_CANVAS_VERSION" "$PREBUILD_NODE_VERSIONS";
fi
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ install:
- set "PYTHON=C:\Python27\python.exe"
- node -v
- npm -v
- ps: cmd /c "call ci\win\exec_with_msys.bat ""ci/install.sh"" win ""$env:PREBUILD_VERSION"" ""$env:PREBUILD_CANVAS_VERSION"" 2>&1"
- ps: cmd /c "call ci\win\exec_with_msys.bat ""ci/install.sh"" win ""$env:PREBUILD_VERSION"" ""$env:PREBUILD_CANVAS_VERSION"" ""$env:PREBUILD_NODE_VERSIONS"" 2>&1"
build: off
artifacts:
- path: '*.tar.gz'
2 changes: 1 addition & 1 deletion ci/install.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
NODEJS_VERSIONS="11 10 9 8 7 6 5 4";
OS=$1;
CANVAS_PREBUILT_VERSION=$2;
CANVAS_VERSION_TO_BUILD=$3;
NODEJS_VERSIONS=$4

if [ "$CANVAS_VERSION_TO_BUILD" = "" ]; then
echo "Can't do anything since you didn't specify which version we're building!";
Expand Down

0 comments on commit e6d0160

Please # to comment.