Skip to content

Commit 1107536

Browse files
mrochMarshall Roch
authored andcommitted
remove OS X travis build
Summary: this is done by Circle now Reviewed By: panagosg7 Differential Revision: D7554832 fbshipit-source-id: 2d9057596c3e0ecf01b825df98e4d649f51b8415
1 parent b2dffb3 commit 1107536

File tree

6 files changed

+13
-81
lines changed

6 files changed

+13
-81
lines changed

.travis.yml

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
sudo: false
2+
os: linux
23
dist: trusty
4+
language: generic
35

46
env:
57
global:
8+
- OCAML_VERSION=4.03.0 OPAM_VERSION=1.2.2
69
# DOC_BOT_TOKEN (flow-bot)
710
- secure: 2Sdk/yAm79iNRpN6U3CT83nDbdeR740lwHLQIoOKGi7jxphWbKq3JNjj2f1Fa4X13sc8yKfEfdQzLSwZVch1fxG4Ib4uzb3RqtH9g0Yf63shl/6EMJE+p83EktNse6BMgSSAkLxruVPE9m7yptmQ0ydlHbO7DLchaTbRs1C73N4=
811
# AWS_ACCESS_KEY_ID
@@ -16,15 +19,6 @@ env:
1619
# CLOUDFRONT_ID
1720
- secure: SbgDWLAqwxJ+/4MdyVDv+ImlPCNIqEc+qMfLmn606QB20ocnS4C8KtKFgZERVcPdBkMiZ2XR5Bk8jrGxPgw0WfxsABe0nxCWn8x6vIUFuScPK4SalTqksNOEuHmSxK4YgmIa855B6KRPQKQyG5HCxWrH2IvDBg7TkCvQG+Rz5cc=
1821

19-
language: generic
20-
matrix:
21-
include:
22-
- os: linux
23-
env: OCAML_VERSION=4.03.0 OPAM_VERSION=1.2.2
24-
25-
- os: osx
26-
env: OCAML_VERSION=4.03.0 OPAM_VERSION=1.2.2
27-
2822
addons:
2923
apt:
3024
sources:
@@ -60,10 +54,6 @@ deploy:
6054
skip_cleanup: true
6155
on:
6256
tags: true
63-
condition:
64-
- $TRAVIS_OS_NAME = linux
65-
- $OCAML_VERSION = 4.03.0
66-
- $OPAM_VERSION = 1.2.2
6757

6858
# Deploy the website
6959
- provider: script
@@ -74,9 +64,6 @@ deploy:
7464
branch: master
7565
condition:
7666
- $TRAVIS_TAG != "" || $TRAVIS_BRANCH = "master"
77-
- $TRAVIS_OS_NAME = linux
78-
- $OCAML_VERSION = 4.03.0
79-
- $OPAM_VERSION = 1.2.2
8067

8168
# Upload release versions of flow.js
8269
- provider: s3
@@ -88,10 +75,6 @@ deploy:
8875
upload-dir: static
8976
on:
9077
tags: true
91-
condition:
92-
- $TRAVIS_OS_NAME = linux
93-
- $OCAML_VERSION = 4.03.0
94-
- $OPAM_VERSION = 1.2.2
9578

9679
# The use of secure prevents forks from spamming irc and email.
9780
# See https://github.com/travis-ci/travis-ci/issues/5063

resources/travis/before_deploy.sh

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,9 @@
22

33
if [[ "$TRAVIS_TAG" = "" ]]; then exit 0; fi
44

5-
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
6-
source $DIR/setup_opam.sh
7-
8-
PLATFORM=$([ "$TRAVIS_OS_NAME" == "linux" ] && echo "linux64" || echo "$TRAVIS_OS_NAME")
9-
10-
cp src/parser/dist/libflowparser.zip \
11-
"$TRAVIS_BUILD_DIR/libflowparser-$PLATFORM-$TRAVIS_TAG.zip"
12-
13-
make dist/flow.zip
14-
cp dist/flow.zip "$TRAVIS_BUILD_DIR/flow-$PLATFORM-$TRAVIS_TAG.zip"
15-
165
# We don't deploy the whole website on tags, but we do upload flow.js and the
176
# libs. This sets up the directory we'll upload. See the deploy section of
187
# .travis.yml.
19-
if [ "$TRAVIS_OS_NAME" == "linux" ]; then
20-
mkdir -p "$HOME/static/$TRAVIS_TAG"
21-
cp "bin/flow.js" "$HOME/static/$TRAVIS_TAG/flow.js"
22-
cp -r "lib" "$HOME/static/${TRAVIS_TAG}/flowlib"
23-
fi
8+
mkdir -p "$HOME/static/$TRAVIS_TAG"
9+
cp "bin/flow.js" "$HOME/static/$TRAVIS_TAG/flow.js"
10+
cp -r "lib" "$HOME/static/${TRAVIS_TAG}/flowlib"

resources/travis/before_install.sh

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,4 @@
11
#!/bin/bash
22

3-
# install system dependencies:
4-
#
5-
# - aspcud for opam (on OS X; installed via apt on Linux)
6-
# - awscli (to talk to AWS)
7-
# - modern node (for yarn and npm)
8-
# - yarn
9-
103
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
11-
12-
case "$TRAVIS_OS_NAME" in
13-
osx)
14-
printf "travis_fold:start:brew_install\nInstalling brew\n"
15-
brew update
16-
brew install aspcud awscli yarn
17-
printf "travis_fold:end:brew_install\n"
18-
;;
19-
*)
20-
;;
21-
esac
22-
234
source "$DIR/setup_node.sh"

resources/travis/deploy.sh

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,8 @@ set +x
66
PAGES_CHECKOUT="$HOME/flowtype.org"
77
export BUNDLE_GEMFILE="${TRAVIS_BUILD_DIR}/website/Gemfile"
88

9-
case "$TRAVIS_OS_NAME" in
10-
osx)
11-
;; # OS X already has a recent version of node
12-
*)
13-
source $HOME/.nvm/nvm.sh
14-
nvm use 6 # should've been installed by before_install.sh
15-
esac
9+
source $HOME/.nvm/nvm.sh
10+
nvm use 6 # should've been installed by before_install.sh
1611

1712
# Add Yarn to PATH
1813
export PATH="${TRAVIS_BUILD_DIR}/resources/travis/node_modules/.bin:$PATH"

resources/travis/install_deps.sh

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,8 @@ unset PREFIX
7070
printf "travis_fold:end:opam_installer\n"
7171

7272
printf "travis_fold:start:yarn_install\nInstalling yarn dependencies\n"
73-
case "$TRAVIS_OS_NAME" in
74-
osx)
75-
# OS X has a modern version of node already
76-
export PATH="$PATH:`yarn global bin`"
77-
;;
78-
*)
79-
source $HOME/.nvm/nvm.sh
80-
nvm use 6
81-
esac
73+
source $HOME/.nvm/nvm.sh
74+
nvm use 6
8275

8376
printf "Using yarn version $(yarn --version)\n"
8477

resources/travis/setup_node.sh

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
11
#!/bin/bash
22

3-
# the OS X container has a modern node, but linux doesn't.
4-
5-
case "$TRAVIS_OS_NAME" in
6-
osx)
7-
;;
8-
*)
9-
source "$HOME/.nvm/nvm.sh"
10-
nvm install 6
11-
nvm use 6
12-
esac
3+
source "$HOME/.nvm/nvm.sh"
4+
nvm install 6
5+
nvm use 6

0 commit comments

Comments
 (0)