diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1d26776d3..bbc94f36f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,11 +3,11 @@ name: build on: push: branches: - - master + - main - 'release/**' pull_request: branches: - - master + - main - 'release/**' jobs: diff --git a/.github/workflows/compatibility.yml b/.github/workflows/compatibility.yml index 44be28ddd..fee345838 100644 --- a/.github/workflows/compatibility.yml +++ b/.github/workflows/compatibility.yml @@ -3,11 +3,11 @@ name: compatibility on: push: branches: - - master + - main - 'release/**' pull_request: branches: - - master + - main - 'release/**' jobs: diff --git a/.github/workflows/delivery-archlinux-git.yml b/.github/workflows/delivery-archlinux-git.yml index 581ba9977..402320f26 100644 --- a/.github/workflows/delivery-archlinux-git.yml +++ b/.github/workflows/delivery-archlinux-git.yml @@ -3,7 +3,7 @@ name: delivery / archlinux / git on: push: branches: - - master + - main jobs: pack-cli-git: diff --git a/.github/workflows/delivery/archlinux/README.md b/.github/workflows/delivery/archlinux/README.md index bba2c85ec..df07ee6fa 100644 --- a/.github/workflows/delivery/archlinux/README.md +++ b/.github/workflows/delivery/archlinux/README.md @@ -4,7 +4,7 @@ There are 3 maintained packages: - [pack-cli](https://aur.archlinux.org/packages/pack-cli/): The latest release of `pack`, compiled from source. - [pack-cli-bin](https://aur.archlinux.org/packages/pack-cli-bin/): The latest release of `pack`, precompiled. -- [pack-cli-git](https://aur.archlinux.org/packages/pack-cli-git/): An unreleased version of `pack`, compiled from source of the `master` branch. +- [pack-cli-git](https://aur.archlinux.org/packages/pack-cli-git/): An unreleased version of `pack`, compiled from source of the `main` branch. ## Current State diff --git a/.github/workflows/delivery/homebrew/pack.rb b/.github/workflows/delivery/homebrew/pack.rb index 807be8a7d..1a9ad976f 100644 --- a/.github/workflows/delivery/homebrew/pack.rb +++ b/.github/workflows/delivery/homebrew/pack.rb @@ -1,5 +1,5 @@ ### -# This file is autogenerated from https://github.com/buildpacks/pack/tree/master/.github/workflows/delivery/homebrew/ +# This file is autogenerated from https://github.com/buildpacks/pack/tree/main/.github/workflows/delivery/homebrew/ # Changes should be committed there. ### class Pack < Formula diff --git a/.github/workflows/release-merge.yml b/.github/workflows/release-merge.yml index 6d897e8aa..28a068529 100644 --- a/.github/workflows/release-merge.yml +++ b/.github/workflows/release-merge.yml @@ -1,4 +1,4 @@ -# Merges changes to release branches back into master. +# Merges changes to release branches back into main. name: release-merge on: @@ -33,7 +33,7 @@ jobs: git config --global user.email "action@github.com" git clone git@github.com:${GITHUB_REPOSITORY}.git cd pack - git checkout master + git checkout main git merge origin/${GITHUB_REF#refs/heads/} --no-edit git show -1 git push \ No newline at end of file diff --git a/.github/workflows/testdata/event-release.json b/.github/workflows/testdata/event-release.json index 7cc69b863..5eaec61f7 100644 --- a/.github/workflows/testdata/event-release.json +++ b/.github/workflows/testdata/event-release.json @@ -240,7 +240,7 @@ "forks": 59, "open_issues": 75, "watchers": 643, - "default_branch": "master", + "default_branch": "main", "temp_clone_token": null, "organization": { "login": "buildpacks", diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1454218c5..2a4262f84 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -75,8 +75,8 @@ Here's a simple template you can use: ``` -[code-of-conduct]: https://github.com/buildpacks/.github/blob/master/CODE_OF_CONDUCT.md -[contributing]: https://github.com/buildpacks/.github/blob/master/CONTRIBUTING.md -[security]: https://github.com/buildpacks/.github/blob/master/SECURITY.md -[support]: https://github.com/buildpacks/.github/blob/master/SUPPORT.md -[pull-request-process]: https://github.com/buildpacks/.github/blob/master/CONTRIBUTIONS.md#pull-request-process +[code-of-conduct]: https://github.com/buildpacks/.github/blob/main/CODE_OF_CONDUCT.md +[contributing]: https://github.com/buildpacks/.github/blob/main/CONTRIBUTING.md +[security]: https://github.com/buildpacks/.github/blob/main/SECURITY.md +[support]: https://github.com/buildpacks/.github/blob/main/SUPPORT.md +[pull-request-process]: https://github.com/buildpacks/.github/blob/main/CONTRIBUTIONS.md#pull-request-process diff --git a/README.md b/README.md index 355a8a203..0c700bd6b 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,9 @@ [![Build results](https://github.com/buildpacks/pack/workflows/build/badge.svg)](https://github.com/buildpacks/pack/actions) [![Go Report Card](https://goreportcard.com/badge/github.com/buildpacks/pack)](https://goreportcard.com/report/github.com/buildpacks/pack) -[![codecov](https://codecov.io/gh/buildpacks/pack/branch/master/graph/badge.svg)](https://codecov.io/gh/buildpacks/pack) +[![codecov](https://codecov.io/gh/buildpacks/pack/branch/main/graph/badge.svg)](https://codecov.io/gh/buildpacks/pack) [![GoDoc](https://godoc.org/github.com/buildpacks/pack?status.svg)](https://godoc.org/github.com/buildpacks/pack) -[![GitHub license](https://img.shields.io/github/license/buildpacks/pack)](https://github.com/buildpacks/pack/blob/master/LICENSE) +[![GitHub license](https://img.shields.io/github/license/buildpacks/pack)](https://github.com/buildpacks/pack/blob/main/LICENSE) [![Slack](https://slack.buildpacks.io/badge.svg)](https://slack.buildpacks.io/) `pack` makes it easy for... @@ -38,4 +38,4 @@ To learn more about the details, check out the [specs repository][specs]. [install-pack]: https://buildpacks.io/docs/install-pack/ [getting-started]: https://buildpacks.io/docs/app-journey [specs]: https://github.com/buildpacks/spec/ -[platform-spec]: https://github.com/buildpacks/spec/blob/master/platform.md +[platform-spec]: https://github.com/buildpacks/spec/blob/main/platform.md diff --git a/acceptance/acceptance_test.go b/acceptance/acceptance_test.go index 7bc4fc505..942096243 100644 --- a/acceptance/acceptance_test.go +++ b/acceptance/acceptance_test.go @@ -224,7 +224,7 @@ lifecycle: // These tests either (a) do not require a builder or (b) do not require a specific builder to be provided // in order to test compatibility. -// They should only be run against the "current" (i.e., master) version of pack. +// They should only be run against the "current" (i.e., main) version of pack. func testWithoutSpecificBuilderRequirement( t *testing.T, when spec.G,