Update configuration to use master vs. bramble

This commit is contained in:
Gideon Thomas 2016-02-19 16:56:22 -05:00
Родитель 43aba14512
Коммит 6dc813cea8
4 изменённых файлов: 5 добавлений и 6 удалений

Просмотреть файл

@ -7,7 +7,7 @@ before_script:
script: grunt build-browser-compressed
branches:
only:
- bramble
- master
- production
notifications:
irc: "irc.mozilla.org#thimble"
@ -28,7 +28,7 @@ deploy:
detect_encoding: true
on:
repo: mozilla/brackets
branch: bramble
branch: master
- provider: s3
access_key_id: AKIAI7XHSZFYVHFRTRIA
secret_access_key:

Просмотреть файл

@ -20,8 +20,7 @@ for info on how we're using CodeMirror.
# How to setup Bramble (Brackets) in your local machine
Step 1: Make sure you fork and clone [Bramble](https://github.com/humphd/brackets).
We do our work on the `bramble` branch, so make sure you aren't on `master`.
Step 1: Make sure you fork and clone [Bramble](https://github.com/mozilla/brackets).
```
$ git clone https://github.com/[yourusername]/brackets --recursive

Просмотреть файл

@ -3,7 +3,7 @@
#
## Which branch is considered master?
export BRAMBLE_MAIN_BRANCH="bramble"
export BRAMBLE_MAIN_BRANCH="master"
## Which remote is considered upstream?
export BRAMBLE_MAIN_REMOTE="upstream"

Просмотреть файл

@ -17,7 +17,7 @@ var cloudfront = new AWS.CloudFront();
// invalidate staging or prod
var invalidationPath;
var distribution;
if (process.env.TRAVIS_BRANCH === 'bramble') {
if (process.env.TRAVIS_BRANCH === 'master') {
invalidationPath = '/bramble/staging/dist/*'
distribution = 'staging';
} else {