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

Commit 0d45227

Browse files
authored
Update travis to deploy main, not master. (#448)
1 parent ebea419 commit 0d45227

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ jobs:
2525
- bundle exec rspec
2626

2727
after_success:
28-
- if [ $TRAVIS_PULL_REQUEST == false ] && [ $TRAVIS_BRANCH == "master" ]; then
28+
- if [ $TRAVIS_PULL_REQUEST == false ] && [ $TRAVIS_BRANCH == "main" ]; then
2929
openssl aes-256-cbc -k $DEPLOY_KEY -in config/deploy_id_rsa_enc_travis -d -a -out config/deploy_id_rsa -d;
3030
chmod 600 config/deploy_id_rsa;
3131
eval `ssh-agent -s`;
3232
ssh-add config/deploy_id_rsa;
33-
BRANCH=master bundle exec cap staging deploy;
33+
BRANCH=main bundle exec cap staging deploy;
3434
ssh-agent -k;
3535
fi
3636
env:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# README
22

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

55
This is the companion application to the [diaper](https://github.com/rubyforgood/diaper) app. The diaper app is an
66
inventory management system and this partner application handles the onboarding, approving, and handling of requests

ubuntu-installation.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Following are instructions for installing PartnerBase on a freshly installed Ubu
44

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

7-
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.
7+
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.
88

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

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

3232
```
33-
curl -o partner.zip https://codeload.github.com/rubyforgood/partner/zip/master \
33+
curl -o partner.zip https://codeload.github.com/rubyforgood/partner/zip/main \
3434
&& unzip partner.zip \
3535
&& rm partner.zip
3636
```

0 commit comments

Comments
 (0)