Skip to content

Commit c159df5

Browse files
authored
Merge pull request #1402 from StoDevX/lockfile
Add npm lockfile
2 parents 11a5929 + 66d2dbe commit c159df5

File tree

7 files changed

+7639
-48
lines changed

7 files changed

+7639
-48
lines changed

.npmrc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
package-lock=false
21
save-exact=true

.travis.yml

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,12 @@ branches:
7878

7979

8080
before_install:
81-
# force a consistent node version on android
82-
- if [[ $ANDROID ]]; then
83-
nvm install "$TRAVIS_NODE_VERSION";
84-
nvm use "$TRAVIS_NODE_VERSION";
85-
fi
81+
- echo "Now testing on $TRAVIS_OS_NAME"
82+
- echo "Using the android emulator? $USE_EMULATOR"
83+
- echo "Travis branch is $TRAVIS_BRANCH"
84+
- echo "Travis is in pull request $TRAVIS_PULL_REQUEST"
85+
- echo "Build triggered by $TRAVIS_EVENT_TYPE"
86+
- echo "Using node $TRAVIS_NODE_VERSION (node -v says $(node -v)"
8687

8788
# make sure to use ruby 2.4
8889
- rvm use ruby-2.4.1 --install --binary --create
@@ -98,13 +99,30 @@ before_install:
9899
$TRAVIS_COMMIT_MESSAGE == *"[ci run beta]"*
99100
) ]]; then run_deploy=1; fi
100101

101-
# run our before_install sequence
102-
- bash scripts/travis/before_install.sh
102+
# force a consistent node version on android
103+
- if [[ $ANDROID ]]; then
104+
nvm install "$TRAVIS_NODE_VERSION";
105+
nvm use "$TRAVIS_NODE_VERSION";
106+
fi
107+
108+
# turn off fancy npm stuff
109+
- npm config set spin=false
110+
- npm config set progress=false
111+
112+
- npm install -g npm@5
113+
- if [[ $JS ]]; then npm install -g greenkeeper-lockfile@1; fi
103114

104115
install:
105-
- bash scripts/travis/install.sh
116+
# install packages (if the first fails, try once more)
117+
- npm install || npm install
118+
119+
# install fastlane (if at first you don't succeed, try once more)
120+
- bundle install || bundle install
121+
122+
- if [[ $TRAVIS_OS_NAME == "osx" ]]; then brew install imagemagick; fi
106123

107124
before_script:
125+
- if [[ $JS ]]; then greenkeeper-lockfile-update; fi
108126
# Fire up the Android emulator
109127
- if [[ $ANDROID && $USE_EMULATOR = yes ]]; then
110128
bundle exec fastlane android ci-emulator;

0 commit comments

Comments
 (0)