Browse Source

Revert "travis-push: test master in .travis.yml"

This reverts commit a6f2caa386.
tags/build-2019-03-04
Tony Theodore 1 year ago
parent
commit
3bf6deaaf6
2 changed files with 2 additions and 2 deletions
  1. 1
    1
      .travis.yml
  2. 1
    1
      tools/travis-push.sh

+ 1
- 1
.travis.yml View File

@@ -4,7 +4,7 @@ sudo: false
4 4
 
5 5
 script:
6 6
   - make docs/build-matrix.html docs/packages.json OS_SHORT_NAME=disable-native-plugins MXE_TARGETS="`echo {i686-w64-mingw32,x86_64-w64-mingw32}.{static,shared}`"
7
-  - if [ "$GH_TOKEN" != "" ]; then [ `git rev-parse --abbrev-ref HEAD` == master ] &&  ./tools/travis-push.sh; fi
7
+  - if [ "$GH_TOKEN" != "" ]; then ./tools/travis-push.sh; fi
8 8
   # Package wxwidgets is downloaded for more than 10 minutes,
9 9
   # Travis failed because of no output for 10 minutes.
10 10
   - while true; do sleep 60; echo -n ' '; done &

+ 1
- 1
tools/travis-push.sh View File

@@ -9,4 +9,4 @@ git config credential.helper "store --file=.git/credentials"
9 9
 echo "https://${GH_TOKEN}:@github.com" > .git/credentials
10 10
 git remote set-url origin 'https://github.com/mxe/mxe.git'
11 11
 git commit -a -m 'Update packages.json & build-matrix.html' || true
12
-git push origin HEAD:master
12
+[ `git rev-parse --abbrev-ref HEAD` == master ] && git push origin HEAD:master

Loading…
Cancel
Save