Skip to content

Commit

Permalink
Changed other instances of master to main (#355)
Browse files Browse the repository at this point in the history
  • Loading branch information
Picowchew authored Aug 25, 2022
1 parent 0a5b75a commit c47a33f
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy-production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
key: ${{ secrets.DEPLOY_SSH_KEY }}
script: |
cd /codey/production
curl -o docker-compose.yml https://raw.githubusercontent.com/uwcsc/codeybot/master/docker/production/docker-compose.yml
curl -o docker-compose.yml https://raw.githubusercontent.com/uwcsc/codeybot/main/docker/production/docker-compose.yml
docker pull uwcsclub/codey-bot:${{ env.RELEASE_TAG }}
echo "TAG=${{ env.RELEASE_TAG }}" > docker.env
docker-compose down
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy-staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Deploy Codey to Staging

on:
push:
branches: [master]
branches: [main]

jobs:
deploy:
Expand Down Expand Up @@ -41,7 +41,7 @@ jobs:
key: ${{ secrets.DEPLOY_SSH_KEY }}
script: |
cd /codey/staging
curl -o docker-compose.yml https://raw.githubusercontent.com/uwcsc/codeybot/master/docker/staging/docker-compose.yml
curl -o docker-compose.yml https://raw.githubusercontent.com/uwcsc/codeybot/main/docker/staging/docker-compose.yml
docker pull uwcsclub/codey-bot:${{ github.sha }}
echo "TAG=${{ github.sha }}" > docker.env
docker-compose down
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

**The Discord Bot of University of Waterloo's Computer Science Club**

[![Build](https://github.com/uwcsc/codeybot/actions/workflows/build.yml/badge.svg?branch=master)](https://github.com/uwcsc/codeybot/actions/workflows/build.yml?query=branch%3Amaster)
[![Build](https://github.com/uwcsc/codeybot/actions/workflows/build.yml/badge.svg?branch=main)](https://github.com/uwcsc/codeybot/actions/workflows/build.yml?query=branch%3Amain)
[![Discord Server](https://discord.com/api/guilds/667823274201448469/widget.png)](https://discord.gg/pHfYBCg)

</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ We always welcome new feature requests for the bot! :D

2. If you wish to work on the issue, ask one of the CodeyBot developers to assign you to the issue.

3. When you're done, make a PR from your branch to `master`. Make sure to link/reference the issue which contains your feature request in your PR.
3. When you're done, make a PR from your branch to `main`. Make sure to link/reference the issue which contains your feature request in your PR.

> Make sure to include screenshots/a demo of your feature request, if applicable.
Expand Down
2 changes: 1 addition & 1 deletion src/commands/miscellaneous/info.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export const getInfoEmbed = async (): Promise<MessageEmbed> => {
.setURL(githubRepositoryInfo.html_url)
.setThumbnail(githubRepositoryInfo.owner.avatar_url)
.setDescription(
'Links to issue templates: https://github.com/uwcsc/codeybot/tree/master/.github/ISSUE_TEMPLATE',
'Links to issue templates: https://github.com/uwcsc/codeybot/tree/main/.github/ISSUE_TEMPLATE',
)
.setFooter(`App version: ${githubRepositoryReleases[0].tag_name}`);
return infoEmbed;
Expand Down

0 comments on commit c47a33f

Please sign in to comment.