Skip to content

Commit

Permalink
Merge pull request #245 from bloodorangeio/main-branch-updates
Browse files Browse the repository at this point in the history
Replace references to 'master' with 'main'
  • Loading branch information
dmcgowan authored Mar 9, 2021
2 parents 3c6a879 + d9ea3ba commit 2fa3dfc
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: release
on:
push:
branches:
- master
- main
tags:
- v*

Expand Down
2 changes: 1 addition & 1 deletion .pullapprove.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ group_defaults:
ignored: true
conditions:
branches:
- master
- main

groups:
distribution-spec:
Expand Down
2 changes: 1 addition & 1 deletion MAINTAINERS_GUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ All decisions affecting this project, big and small, follow the same procedure:

### I'm a maintainer, should I make pull requests too?

Yes. Nobody should ever push to master directly. All changes should be
Yes. Nobody should ever push to main directly. All changes should be
made through a pull request.

## Who decides what?
Expand Down
4 changes: 2 additions & 2 deletions conformance/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ This will create a local `results/` directory containing all of the test report
A GitHub Action is provided by this repo which you can use
as part of a GitHub-based CI pipeline.

The following example will build the binary off of the master branch,
The following example will build the binary off of the main branch,
run the tests, and upload `junit.xml` and `report.html` as build artifacts:

```yaml
Expand All @@ -215,7 +215,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Run OCI Distribution Spec conformance tests
uses: opencontainers/distribution-spec@master
uses: opencontainers/distribution-spec@main
env:
OCI_ROOT_URL: https://myreg.io
OCI_NAMESPACE: mytestorg/mytestrepo
Expand Down

0 comments on commit 2fa3dfc

Please sign in to comment.