Rename some references from master to main (#11897)

* Rename some references from master to main

* Update changelog-checker
This commit is contained in:
Jim Kalafut 2021-06-18 11:24:54 -07:00 committed by GitHub
parent 515f41558d
commit 3d9036e663
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 10 additions and 10 deletions

4
.circleci/config.yml generated
View File

@ -571,7 +571,7 @@ jobs:
- run:
command: |
case "$CIRCLE_BRANCH" in
master|ui/*|release/*|merge*) ;;
main|ui/*|release/*|merge*) ;;
*) # If the branch being tested doesn't match one of the above patterns,
# we don't need to run test-ui and can abort the job.
circleci-agent step halt
@ -2385,7 +2385,7 @@ workflows:
filters:
branches:
only:
- master
- main
context: vault-docs
- algolia-index:
filters:

View File

@ -6,7 +6,7 @@ steps:
name: Check branch name
command: |
case "$CIRCLE_BRANCH" in
master|ui/*|release/*|merge*) ;;
main|ui/*|release/*|merge*) ;;
*) # If the branch being tested doesn't match one of the above patterns,
# we don't need to run test-ui and can abort the job.
circleci-agent step halt

View File

@ -10,7 +10,7 @@ jobs:
requires:
- install-ui-dependencies
- build-go-dev
# Only master, UI, release and merge branches need to run UI tests.
# Only main, UI, release and merge branches need to run UI tests.
# We don't filter here however because test-ui is configured in github as
# required so it must run, instead we short-circuit within test-ui.
- test-ui-browserstack:
@ -54,7 +54,7 @@ jobs:
filters:
branches:
only:
- master
- main
- algolia-index:
context: vault-docs
filters:

View File

@ -6,9 +6,9 @@ name: Check Changelog
on:
pull_request:
types: [opened, synchronize, labeled, unlabeled]
# Runs on PRs to master
# Runs on PRs to main
branches:
- master
- main
jobs:
# checks that a changelog entry is present for a PR

View File

@ -14,7 +14,7 @@ jobs:
with:
ref: stable-website
- run: |
git fetch --no-tags --prune origin master
git fetch --no-tags --prune origin main
git config --local user.email "action@github.com"
git config --local user.name "GitHub Action"
git cherry-pick ${{ github.sha }}

View File

@ -28,7 +28,7 @@ DIR="$( cd -P "$( dirname "$SOURCE" )/.." && pwd )"
cd $DIR
if [ -z $RELBRANCH ]; then
RELBRANCH=master
RELBRANCH=main
fi
# Tag, unless told not to

View File

@ -32,7 +32,7 @@ do
cd ..
fi
cd vault
go get github.com/hashicorp/$plugin@master
go get github.com/hashicorp/$plugin@main
cd ..
done