Skip to content

Commit 856a218

Browse files
authored
Merge pull request #163 from fluxcd/main-branch
Set default branch to main
2 parents 2331334 + f81b479 commit 856a218

File tree

6 files changed

+11
-10
lines changed

6 files changed

+11
-10
lines changed

.github/workflows/e2e.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
pull_request:
55
push:
66
branches:
7-
- master
7+
- main
88

99
jobs:
1010
kind:

.github/workflows/fossa.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
name: FOSSA
22
on:
33
push:
4-
branches: [master]
4+
branches: [main]
55
pull_request:
6-
branches: [master]
6+
branches: [main]
77

88
jobs:
99
build:

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ jobs:
102102
draft: false
103103
prerelease: true
104104
body: |
105-
[CHANGELOG](https://github.com/fluxcd/source-controller/blob/master/CHANGELOG.md)
105+
[CHANGELOG](https://github.com/fluxcd/source-controller/blob/main/CHANGELOG.md)
106106
- name: Upload artifacts
107107
if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
108108
id: upload-release-asset

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ The Helm package was updated to v3.3.4.
2424
## 0.0.17 (2020-09-18)
2525

2626
This prerelease comes with support for S3 compatible storage sources
27-
defined as [buckets](https://github.com/fluxcd/source-controller/blob/master/docs/spec/v1alpha1/buckets.md).
27+
defined as [buckets](https://github.com/fluxcd/source-controller/blob/main/docs/spec/v1alpha1/buckets.md).
2828
The Helm package was updated to v3.3.2.
2929

3030
## 0.0.16 (2020-09-12)
@@ -122,7 +122,7 @@ to be specified on `GitRepository` objects.
122122
This prerelease comes with Kubernetes events dispatching.
123123
The reconciliation events can be forwarded to notification controller
124124
and alerting can be configured for Slack, MS Teams, Discord and Rocket chat
125-
using the [notification.fluxcd.io API](https://github.com/fluxcd/notification-controller/tree/master/docs/spec).
125+
using the [notification.fluxcd.io API](https://github.com/fluxcd/notification-controller/tree/main/docs/spec).
126126

127127
## 0.0.1 (2020-06-24)
128128

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[![e2e](https://github.com/fluxcd/source-controller/workflows/e2e/badge.svg)](https://github.com/fluxcd/kustomize-controller/actions)
44
[![report](https://goreportcard.com/badge/github.com/fluxcd/source-controller)](https://goreportcard.com/report/github.com/fluxcd/source-controller)
5-
[![license](https://img.shields.io/github/license/fluxcd/source-controller.svg)](https://github.com/fluxcd/source-controller/blob/master/LICENSE)
5+
[![license](https://img.shields.io/github/license/fluxcd/source-controller.svg)](https://github.com/fluxcd/source-controller/blob/main/LICENSE)
66
[![release](https://img.shields.io/github/release/fluxcd/source-controller/all.svg)](https://github.com/fluxcd/source-controller/releases)
77

88
The source-controller is a Kubernetes operator, specialised in artifacts acquisition

docs/internal/release.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22

33
To release a new version the following steps should be followed:
44

5-
1. Create a new branch from `master` i.e. `release-<next semver>`. This
5+
1. Create a `api/<next semver>` tag and push it to remote.
6+
1. Create a new branch from `main` i.e. `release-<next semver>`. This
67
will function as your release preparation branch.
78
1. Add an entry to the `CHANGELOG.md` for the new release and change the
89
`newTag` value in ` config/manager/kustomization.yaml` to that of the
910
semver release you are going to make. Commit and push your changes.
10-
1. Create a PR for your release branch and get it merged into `master`.
11-
1. Create a `<next semver>` tag for the merge commit in `master` and
11+
1. Create a PR for your release branch and get it merged into `main`.
12+
1. Create a `<next semver>` tag for the merge commit in `main` and
1213
push it to remote.
1314
1. Confirm CI builds and releases the newly tagged version.

0 commit comments

Comments
 (0)