Skip to content

Commit eb52ce8

Browse files
committed
chore: retarget master branch refs to main (#5507)
Prepares for the master -> main release-branch rename: - workflow triggers (pr, stb_tests, backend_tests, frontend_tests, documentation) now target main - console-sync-release pipeline + secrets sample branch refs - Chart.yaml icon raw URL (raw URLs do not redirect on rename) - package.json climate script diff base - .travis.yml branch allowlist (v2-master left as-is) - docs: release_guide, contributing guides, developer-environment, devops_guide, cf-api-v2-usage, README license badge - CONTRIBUTING.md: corrected stale claim that PRs target master (they target develop; main is the release branch) Other projects' master URLs (helm, gimme, mo, mariadb, angular-cli, monocular) and historical CHANGELOG entries are untouched.
1 parent 7f28167 commit eb52ce8

17 files changed

Lines changed: 34 additions & 34 deletions

.github/workflows/backend_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
branches:
66
- develop
7-
- master
7+
- main
88
# tools/stb has its own gate (stb_tests.yml); skip the backend suite
99
# for stb-only changes.
1010
paths-ignore:

.github/workflows/documentation.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: documentation
22

33
on:
44
pull_request:
5-
branches: [master]
5+
branches: [main]
66
push:
7-
branches: [master]
7+
branches: [main]
88

99
env:
1010
FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: 'true'

.github/workflows/frontend_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
branches:
66
- develop
7-
- master
7+
- main
88
# tools/stb has its own gate (stb_tests.yml); skip the frontend suite
99
# for stb-only changes.
1010
paths-ignore:

.github/workflows/pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ name: Pull Request Tests
1010
on:
1111
pull_request:
1212
branches:
13-
- master
13+
- main
1414
- develop
1515
- 'angular**'
1616
push:
1717
branches:
1818
- develop
19-
- master
19+
- main
2020

2121
env:
2222
NODE_OPTIONS: --max-old-space-size=5500

.github/workflows/stb_tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ name: STB Tests
1616
on:
1717
pull_request:
1818
branches:
19-
- master
19+
- main
2020
- develop
2121
- 'angular**'
2222
push:
2323
branches:
2424
- develop
25-
- master
25+
- main
2626
paths:
2727
- 'tools/stb/**'
2828

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ install:
1717
filter_secrets: false
1818
branches:
1919
only:
20-
- master
20+
- main
2121
- v2-master
2222
- e2e-tests
2323
cache:

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ To send your code change, use GitHub pull requests. The workflow is as follows:
3535

3636
1. Fork the project.
3737

38-
1. Create a branch based on `master`.
38+
1. Create a branch based on `develop`.
3939

4040
1. Implement your change, including tests and documentation.
4141

@@ -66,8 +66,8 @@ pointing to the number of the issue (e.g. "Fixes #123").
6666

6767
### Pull requests and branches
6868

69-
All work happens in branches. The master branch is only used as the target for pull
70-
requests.
69+
All work happens in branches. The develop branch is the target for pull
70+
requests; releases are cut from main.
7171

7272
During code review you often need to update pull requests. Usually you do that
7373
by pushing additional commits.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<a href="https://goreportcard.com/report/github.com/cloudfoundry/stratos"><img src="https://goreportcard.com/badge/github.com/cloudfoundry-incubator/stratos"/></a>
55
<a href="https://codecov.io/gh/cloudfoundry-community/stratos/branch/master"><img src="https://codecov.io/gh/cloudfoundry-community/stratos/branch/master/graph/badge.svg"/></a>
66
[![GitHub release](https://img.shields.io/github/release/cloudfoundry-community/stratos.svg)](https://github.com/cloudfoundry/stratos/releases/latest)
7-
[![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/cloudfoundry/stratos/blob/master/LICENSE)
7+
[![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/cloudfoundry/stratos/blob/main/LICENSE)
88
[![slack.cloudfoundry.org](https://slack.cloudfoundry.org/badge.svg)](https://cloudfoundry.slack.com/messages/C80EP4Y57/)
99

1010
# Roadmap

deploy/ci/console-sync-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ resources:
88
- name: helm-charts-repository
99
type: git
1010
source:
11-
branch: master
11+
branch: main
1212
private_key: {{github-private-key}}
1313
uri: {{release-helm-repo}}
1414
jobs:

deploy/ci/secrets.yml-sample

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Branches
2-
stratos-deploy-branch: master
3-
stratos-ui-branch: master
2+
stratos-deploy-branch: main
3+
stratos-ui-branch: main
44
ui-pr-label: my-pr-label
55

66
# Images

0 commit comments

Comments
 (0)