From 0432c13aa5e855472127a3d2012069bf7a5ce4e1 Mon Sep 17 00:00:00 2001 From: Prem Saraswat Date: Sat, 27 Feb 2021 16:51:35 +0530 Subject: [PATCH] Fix CI configs and scripts to work with main branch Signed-off-by: Prem Saraswat --- .circleci/config.yml | 6 +++--- .github/workflows/codeql-analysis.yml | 4 ++-- .github/workflows/docs.yaml | 2 +- .github/workflows/go.yaml | 2 +- .github/workflows/react.yml | 2 +- scripts/website/contentpreprocess.sh | 2 +- scripts/website/websitepreprocess.sh | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ec8335130f..38202900be 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -68,7 +68,7 @@ jobs: paths: - .build - publish_master: + publish_main: executor: golang steps: - checkout @@ -116,12 +116,12 @@ workflows: filters: tags: only: /.*/ - - publish_master: + - publish_main: requires: - test filters: branches: - only: master + only: main - cross_build: requires: - test diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index ef3cc902a7..d74e090582 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -13,10 +13,10 @@ name: "CodeQL" on: push: - branches: [ master ] + branches: [ main ] pull_request: # The branches below must be a subset of the branches above - branches: [ master ] + branches: [ main ] schedule: - cron: '30 12 * * 1' diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index 852d2d4d90..0952cefd38 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -3,7 +3,7 @@ name: docs on: push: branches: - - master + - main tags: pull_request: diff --git a/.github/workflows/go.yaml b/.github/workflows/go.yaml index 3fb8cf2d6c..8277fcb9d6 100644 --- a/.github/workflows/go.yaml +++ b/.github/workflows/go.yaml @@ -3,7 +3,7 @@ name: go on: push: branches: - - master + - main tags: pull_request: diff --git a/.github/workflows/react.yml b/.github/workflows/react.yml index 43d22bdc45..ea25189eb7 100644 --- a/.github/workflows/react.yml +++ b/.github/workflows/react.yml @@ -3,7 +3,7 @@ name: react on: push: branches: - - master + - main pull_request: jobs: diff --git a/scripts/website/contentpreprocess.sh b/scripts/website/contentpreprocess.sh index b966c3b837..470c922adc 100755 --- a/scripts/website/contentpreprocess.sh +++ b/scripts/website/contentpreprocess.sh @@ -98,7 +98,7 @@ for file in ${ALL_DOC_CONTENT_FILES}; do --- Found a typo, inconsistency or missing information in our docs? -Help us to improve [Thanos](https://thanos.io) documentation by proposing a fix [on GitHub here](https://github.com/thanos-io/thanos/edit/master/docs/${relFile}) :heart: +Help us to improve [Thanos](https://thanos.io) documentation by proposing a fix [on GitHub here](https://github.com/thanos-io/thanos/edit/main/docs/${relFile}) :heart: EOF )" >>${file} diff --git a/scripts/website/websitepreprocess.sh b/scripts/website/websitepreprocess.sh index 0b2229efba..f7e11060ce 100755 --- a/scripts/website/websitepreprocess.sh +++ b/scripts/website/websitepreprocess.sh @@ -13,7 +13,7 @@ git remote add origin https://github.com/thanos-io/thanos.git git remote -v git fetch origin -RELEASE_BRANCHES=$(git branch --all | grep -P "remotes/origin/${RELEASE_FILTER_RE}" | egrep --invert-match '(:?HEAD|master)$' | sort -V) +RELEASE_BRANCHES=$(git branch --all | grep -P "remotes/origin/${RELEASE_FILTER_RE}" | egrep --invert-match '(:?HEAD|main)$' | sort -V) echo ">> chosen $(echo ${RELEASE_BRANCHES}) releases to deploy docs from" rm -rf ${OUTPUT_CONTENT_DIR}