From 62c67c1b3710a760d1e3e6a2be27bae6b764e444 Mon Sep 17 00:00:00 2001 From: Fran Mulero Date: Mon, 17 Oct 2022 15:34:29 +0200 Subject: [PATCH] [bitnami/charts] Default branch renaming in .github (#12942) * [bitnami/charts] Default branch renaming in .github Signed-off-by: Fran Mulero * Fix wrong conflict resolution Signed-off-by: Fran Mulero Signed-off-by: Fran Mulero --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- .github/workflows/cd-pipeline.yml | 2 +- .github/workflows/ci-pipeline-extra-thanos.yml | 2 +- .github/workflows/ci-pipeline.yml | 4 ++-- .github/workflows/generate-chart-readme.yml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index f0f8c8b9aa..f8c8619522 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -38,4 +38,4 @@ - [ ] Chart version bumped in `Chart.yaml` according to [semver](http://semver.org/). This is *not necessary* when the changes only affect README.md files. - [ ] Variables are documented in the values.yaml and added to the `README.md` using [readme-generator-for-helm](https://github.com/bitnami-labs/readme-generator-for-helm) - [ ] Title of the pull request follows this pattern [bitnami/] Descriptive title -- [ ] All commits signed off and in agreement of [Developer Certificate of Origin (DCO)](https://github.com/bitnami/charts/blob/master/CONTRIBUTING.md#sign-your-work) +- [ ] All commits signed off and in agreement of [Developer Certificate of Origin (DCO)](https://github.com/bitnami/charts/blob/main/CONTRIBUTING.md#sign-your-work) diff --git a/.github/workflows/cd-pipeline.yml b/.github/workflows/cd-pipeline.yml index 9281295025..ec0b315a96 100644 --- a/.github/workflows/cd-pipeline.yml +++ b/.github/workflows/cd-pipeline.yml @@ -2,7 +2,7 @@ name: '[CI/CD] CD Pipeline' on: # rebuild any PRs and main branch changes push: branches: - - master + - main paths: - 'bitnami/airflow/**' - 'bitnami/apache/**' diff --git a/.github/workflows/ci-pipeline-extra-thanos.yml b/.github/workflows/ci-pipeline-extra-thanos.yml index 9b6eda0bac..fbd7df885d 100644 --- a/.github/workflows/ci-pipeline-extra-thanos.yml +++ b/.github/workflows/ci-pipeline-extra-thanos.yml @@ -7,7 +7,7 @@ on: # rebuild any PRs and main branch changes - synchronize - labeled branches: - - master + - main paths: - 'bitnami/thanos/*' env: diff --git a/.github/workflows/ci-pipeline.yml b/.github/workflows/ci-pipeline.yml index c85629c40f..a62fe29778 100644 --- a/.github/workflows/ci-pipeline.yml +++ b/.github/workflows/ci-pipeline.yml @@ -7,8 +7,8 @@ on: # rebuild any PRs and main branch changes - synchronize - labeled branches: - - master - - bitnami:master + - main + - bitnami:main permissions: issues: write pull-requests: write diff --git a/.github/workflows/generate-chart-readme.yml b/.github/workflows/generate-chart-readme.yml index 6ff734237b..791a4ad891 100644 --- a/.github/workflows/generate-chart-readme.yml +++ b/.github/workflows/generate-chart-readme.yml @@ -3,7 +3,7 @@ name: '[Support] Update README metadata' on: pull_request_target: branches: - - master + - main paths: - 'bitnami/*/values.yaml' permissions: