From fa6778935005d0393a3429f329484a8f572f3e85 Mon Sep 17 00:00:00 2001
From: stefanprodan <stefan.prodan@gmail.com>
Date: Thu, 1 Oct 2020 22:45:45 +0300
Subject: [PATCH] Change default branch to main
---
.github/workflows/docs.yaml | 3 +--
.github/workflows/e2e.yaml | 2 +-
.github/workflows/fossa.yml | 4 ++--
README.md | 3 ++-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
index c18cb81f..9409f03e 100644
--- a/.github/workflows/docs.yaml
+++ b/.github/workflows/docs.yaml
@@ -3,8 +3,7 @@ on:
push:
branches:
- docs*
- - roadmap*
- - master
+ - main
tags:
- '*'
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 80f713f1..80418375 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -4,7 +4,7 @@ on:
pull_request:
push:
branches:
- - master
+ - main
jobs:
kind:
diff --git a/.github/workflows/fossa.yml b/.github/workflows/fossa.yml
index f24fa033..05c82e79 100644
--- a/.github/workflows/fossa.yml
+++ b/.github/workflows/fossa.yml
@@ -1,9 +1,9 @@
name: FOSSA
on:
push:
- branches: [master]
+ branches: [main]
pull_request:
- branches: [master]
+ branches: [main]
jobs:
build:
diff --git a/README.md b/README.md
index 649a0ede..97049453 100644
--- a/README.md
+++ b/README.md
@@ -61,6 +61,7 @@ or get started with one of the following guides:
- [GitRepository CRD](https://toolkit.fluxcd.io/components/source/gitrepositories/)
- [HelmRepository CRD](https://toolkit.fluxcd.io/components/source/helmrepositories/)
- [HelmChart CRD](https://toolkit.fluxcd.io/components/source/helmcharts/)
+ - [Bucket CRD](https://toolkit.fluxcd.io/components/source/buckets/)
- [Kustomize Controller](https://toolkit.fluxcd.io/components/kustomize/controller/)
- [Kustomization CRD](https://toolkit.fluxcd.io/components/kustomize/kustomization/)
- [Helm Controller](https://toolkit.fluxcd.io/components/helm/controller/)
@@ -79,6 +80,6 @@ The GitOps Toolkit is always looking for new contributors and there are a multit
- Join the [planning discussions](https://github.com/fluxcd/toolkit/discussions)
- And if you are completely new to the GitOps Toolkit, take a look at our [Get Started guide](https://toolkit.fluxcd.io/get-started/) and give us feedback
- To be part of the conversation about Flux's development, [join the flux-dev mailing list](https://lists.cncf.io/g/cncf-flux-dev).
-- Check out [how to contribute](contributing/index.md) to the project
+- Check out [how to contribute](CONTRIBUTING.md) to the project
We are looking forward to seeing you with us!
--
GitLab