From d9ea3ba6bfcfad7eab45c3cff06f36c2eb18a5de Mon Sep 17 00:00:00 2001 From: Josh Dolitsky Date: Tue, 9 Mar 2021 12:47:44 -0500 Subject: [PATCH] Replace references to 'master' with 'main' Signed-off-by: Josh Dolitsky --- .github/workflows/release.yml | 2 +- .pullapprove.yml | 2 +- MAINTAINERS_GUIDE.md | 2 +- conformance/README.md | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f1459cde..2388e952 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,7 +3,7 @@ name: release on: push: branches: - - master + - main tags: - v* diff --git a/.pullapprove.yml b/.pullapprove.yml index 6e487805..f66409ef 100644 --- a/.pullapprove.yml +++ b/.pullapprove.yml @@ -20,7 +20,7 @@ group_defaults: ignored: true conditions: branches: - - master + - main groups: distribution-spec: diff --git a/MAINTAINERS_GUIDE.md b/MAINTAINERS_GUIDE.md index 8e969174..e420e6d8 100644 --- a/MAINTAINERS_GUIDE.md +++ b/MAINTAINERS_GUIDE.md @@ -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? diff --git a/conformance/README.md b/conformance/README.md index e3d7bd78..f55a7c7b 100644 --- a/conformance/README.md +++ b/conformance/README.md @@ -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 @@ -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