mirror of
https://github.com/optim-enterprises-bv/vault.git
synced 2025-10-30 02:02:43 +00:00
Rename some references from master to main (#11897)
* Rename some references from master to main * Update changelog-checker
This commit is contained in:
4
.circleci/config.yml
generated
4
.circleci/config.yml
generated
@@ -571,7 +571,7 @@ jobs:
|
|||||||
- run:
|
- run:
|
||||||
command: |
|
command: |
|
||||||
case "$CIRCLE_BRANCH" in
|
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,
|
*) # 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.
|
# we don't need to run test-ui and can abort the job.
|
||||||
circleci-agent step halt
|
circleci-agent step halt
|
||||||
@@ -2385,7 +2385,7 @@ workflows:
|
|||||||
filters:
|
filters:
|
||||||
branches:
|
branches:
|
||||||
only:
|
only:
|
||||||
- master
|
- main
|
||||||
context: vault-docs
|
context: vault-docs
|
||||||
- algolia-index:
|
- algolia-index:
|
||||||
filters:
|
filters:
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ steps:
|
|||||||
name: Check branch name
|
name: Check branch name
|
||||||
command: |
|
command: |
|
||||||
case "$CIRCLE_BRANCH" in
|
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,
|
*) # 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.
|
# we don't need to run test-ui and can abort the job.
|
||||||
circleci-agent step halt
|
circleci-agent step halt
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ jobs:
|
|||||||
requires:
|
requires:
|
||||||
- install-ui-dependencies
|
- install-ui-dependencies
|
||||||
- build-go-dev
|
- 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
|
# 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.
|
# required so it must run, instead we short-circuit within test-ui.
|
||||||
- test-ui-browserstack:
|
- test-ui-browserstack:
|
||||||
@@ -54,7 +54,7 @@ jobs:
|
|||||||
filters:
|
filters:
|
||||||
branches:
|
branches:
|
||||||
only:
|
only:
|
||||||
- master
|
- main
|
||||||
- algolia-index:
|
- algolia-index:
|
||||||
context: vault-docs
|
context: vault-docs
|
||||||
filters:
|
filters:
|
||||||
|
|||||||
4
.github/workflows/changelog-checker.yml
vendored
4
.github/workflows/changelog-checker.yml
vendored
@@ -6,9 +6,9 @@ name: Check Changelog
|
|||||||
on:
|
on:
|
||||||
pull_request:
|
pull_request:
|
||||||
types: [opened, synchronize, labeled, unlabeled]
|
types: [opened, synchronize, labeled, unlabeled]
|
||||||
# Runs on PRs to master
|
# Runs on PRs to main
|
||||||
branches:
|
branches:
|
||||||
- master
|
- main
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
# checks that a changelog entry is present for a PR
|
# checks that a changelog entry is present for a PR
|
||||||
|
|||||||
2
.github/workflows/stable-website.yaml
vendored
2
.github/workflows/stable-website.yaml
vendored
@@ -14,7 +14,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
ref: stable-website
|
ref: stable-website
|
||||||
- run: |
|
- 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.email "action@github.com"
|
||||||
git config --local user.name "GitHub Action"
|
git config --local user.name "GitHub Action"
|
||||||
git cherry-pick ${{ github.sha }}
|
git cherry-pick ${{ github.sha }}
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ DIR="$( cd -P "$( dirname "$SOURCE" )/.." && pwd )"
|
|||||||
cd $DIR
|
cd $DIR
|
||||||
|
|
||||||
if [ -z $RELBRANCH ]; then
|
if [ -z $RELBRANCH ]; then
|
||||||
RELBRANCH=master
|
RELBRANCH=main
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Tag, unless told not to
|
# Tag, unless told not to
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ do
|
|||||||
cd ..
|
cd ..
|
||||||
fi
|
fi
|
||||||
cd vault
|
cd vault
|
||||||
go get github.com/hashicorp/$plugin@master
|
go get github.com/hashicorp/$plugin@main
|
||||||
cd ..
|
cd ..
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user