Skip to content

Commit

Permalink
Merge pull request #69 from procore-oss/jm-remove-master-branch-refer…
Browse files Browse the repository at this point in the history
…ences
  • Loading branch information
jmeridth authored Feb 19, 2024
2 parents a95f130 + 7a690ee commit 08e45f5
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Checklist:

* [ ] I have updated the necessary documentation
* [ ] I have signed off all my commits as required by [DCO](https://github.com/procore-oss/blueprinter/blob/main/CONTRIBUTING.md)
* [ ] I have signed off all my commits as required by [DCO](https://github.com/procore-oss/ruby-sdk/blob/main/CONTRIBUTING.md)
* [ ] My build is green

<!--
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:
workflow_run:
workflows: [Test]
types: [completed]
branches: [master, main]
branches: [main]
workflow_dispatch: # allow manual deployment through GitHub Action UI
jobs:
release:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: Test
on:
push:
branches: [master, main]
branches: [main]
pull_request:
branches: [master, main]
branches: [main]
permissions:
contents: read
jobs:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,7 @@ Please **do not** bump the gem version in your PR. This will be done in a follow

Gem maintainer should follow these steps to release a new version:

1. Merge all PRs into the `master` branch that you want included in the release.
1. Merge all PRs into the `main` branch that you want included in the release.
2. Update `version.rb` to a new semantic version, and move unreleased items in `CHANGELOG.md` into a section for that version.
3. Stage and commit changes. `git commit -a`
4. Create a tag for the new version. `git tag -a {version}`
Expand Down

0 comments on commit 08e45f5

Please sign in to comment.