chore: DRY up bolt versions

electron · Mar 18, 2019 · e1fadab · e1fadab
1 parent 1fd4c7a
commit e1fadab
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,9 @@ osx_image: xcode8.3
 cache: npm
 services:
 - docker
+env:
+  global:
+  - BOLT_VERSION: "0.22.6"
 jobs:
   include:
   - stage: test
@@ -29,7 +32,7 @@ branches:
   - master
   - /^v\d+\.\d+\.\d+/
 install:
-- if [[ "$TRAVIS_OS_NAME" = "osx" ]]; then npm install -g bolt@0.22.6; fi
+- if [[ "$TRAVIS_OS_NAME" = "osx" ]]; then npm install -g bolt@$BOLT_VERSION; fi
 script: ci/script.sh
 after_success: ci/coverage.sh
 notifications:

diff --git a/ci/docker.sh b/ci/docker.sh
@@ -1,11 +1,10 @@
-#!/bin/bash
-
-set -e
+#!/bin/bash -e
 
 NODE_INSTALLER="$1"
+BOLT_VERSION="$2"
 
 npm i -g yarn
-npm i -g bolt@0.22.6
+npm i -g bolt@$BOLT_VERSION
 
 cd /code
 

diff --git a/ci/script.sh b/ci/script.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -e
 
 if [[ "$TRAVIS_OS_NAME" = "linux" ]]; then
-    sudo docker run --privileged --interactive --tty --volume $(pwd):/code malept/electron-forge-container:latest /code/ci/docker.sh $NODE_INSTALLER
+    sudo docker run --privileged --interactive --tty --volume $(pwd):/code malept/electron-forge-container:latest /code/ci/docker.sh $NODE_INSTALLER $BOLT_VERSION
 else
     bolt
     yarn build