Skip to content
This repository has been archived by the owner on Nov 6, 2021. It is now read-only.

Commit

Permalink
Update travis to deploy main, not master. (#448)
Browse files Browse the repository at this point in the history
  • Loading branch information
seanmarcia authored Oct 1, 2020
1 parent ebea419 commit 0d45227
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ jobs:
- bundle exec rspec

after_success:
- if [ $TRAVIS_PULL_REQUEST == false ] && [ $TRAVIS_BRANCH == "master" ]; then
- if [ $TRAVIS_PULL_REQUEST == false ] && [ $TRAVIS_BRANCH == "main" ]; then
openssl aes-256-cbc -k $DEPLOY_KEY -in config/deploy_id_rsa_enc_travis -d -a -out config/deploy_id_rsa -d;
chmod 600 config/deploy_id_rsa;
eval `ssh-agent -s`;
ssh-add config/deploy_id_rsa;
BRANCH=master bundle exec cap staging deploy;
BRANCH=main bundle exec cap staging deploy;
ssh-agent -k;
fi
env:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# README

[![Build Status](https://travis-ci.org/rubyforgood/partner.svg?branch=master)](https://travis-ci.org/rubyforgood/partner)
[![Build Status](https://travis-ci.org/rubyforgood/partner.svg?branch=main)](https://travis-ci.org/rubyforgood/partner)

This is the companion application to the [diaper](https://github.com/rubyforgood/diaper) app. The diaper app is an
inventory management system and this partner application handles the onboarding, approving, and handling of requests
Expand Down
4 changes: 2 additions & 2 deletions ubuntu-installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Following are instructions for installing PartnerBase on a freshly installed Ubu

Many of these instructions can probably work as is, or easily be translated to work on a Mac.

There are two kinds of installations; one for a developer and another for a deployment. The only difference between the two is that the former will need git installed and need to `git clone` the repo, whereas the latter can just download a copy of master.
There are two kinds of installations; one for a developer and another for a deployment. The only difference between the two is that the former will need git installed and need to `git clone` the repo, whereas the latter can just download a copy of main.

Obviously, if any of these steps are already done you will probably not need to do them, so just ignore those steps.

Expand All @@ -30,7 +30,7 @@ If you will be using this machine for development, you will need to `git clone`
If you only need to have the files but don't need to use git, you can download the zip file and unzip it:

```
curl -o partner.zip https://codeload.github.com/rubyforgood/partner/zip/master \
curl -o partner.zip https://codeload.github.com/rubyforgood/partner/zip/main \
&& unzip partner.zip \
&& rm partner.zip
```
Expand Down

0 comments on commit 0d45227

Please sign in to comment.