Skip to content

Commit

Permalink
Rename master branch to main
Browse files Browse the repository at this point in the history
Signed-off-by: Javier Romero <rjavier@vmware.com>
  • Loading branch information
jromero committed Jun 18, 2020
1 parent 79d84ba commit bbe5aca
Show file tree
Hide file tree
Showing 10 changed files with 19 additions and 19 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ name: build
on:
push:
branches:
- master
- main
- 'release/**'
pull_request:
branches:
- master
- main
- 'release/**'

jobs:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/compatibility.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ name: compatibility
on:
push:
branches:
- master
- main
- 'release/**'
pull_request:
branches:
- master
- main
- 'release/**'

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/delivery-archlinux-git.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: delivery / archlinux / git
on:
push:
branches:
- master
- main

jobs:
pack-cli-git:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/delivery/archlinux/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/delivery/homebrew/pack.rb
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-merge.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Merges changes to release branches back into master.
# Merges changes to release branches back into main.
name: release-merge

on:
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/testdata/event-release.json
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@
"forks": 59,
"open_issues": 75,
"watchers": 643,
"default_branch": "master",
"default_branch": "main",
"temp_clone_token": null,
"organization": {
"login": "buildpacks",
Expand Down
10 changes: 5 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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...
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion acceptance/acceptance_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit bbe5aca

Please sign in to comment.