Skip to content

Commit

Permalink
Fix CI configs and scripts to work with main branch (#3848)
Browse files Browse the repository at this point in the history
Signed-off-by: Prem Saraswat <[email protected]>
  • Loading branch information
onprem authored Feb 28, 2021
1 parent 55da24f commit 6877bd1
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
paths:
- .build

publish_master:
publish_main:
executor: golang
steps:
- checkout
Expand Down Expand Up @@ -116,12 +116,12 @@ workflows:
filters:
tags:
only: /.*/
- publish_master:
- publish_main:
requires:
- test
filters:
branches:
only: master
only: main
- cross_build:
requires:
- test
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: docs
on:
push:
branches:
- master
- main
tags:
pull_request:

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/go.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: go
on:
push:
branches:
- master
- main
tags:
pull_request:

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/react.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: react
on:
push:
branches:
- master
- main
pull_request:

jobs:
Expand Down
2 changes: 1 addition & 1 deletion scripts/website/contentpreprocess.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion scripts/website/websitepreprocess.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down

0 comments on commit 6877bd1

Please sign in to comment.