Skip to content

Commit 9a166e8

Browse files
author
Mike Shaw
committed
chore: amend references to master branch
Signed-off-by: Mike Shaw <mike.shaw@engineering.digital.dwp.gov.uk>
1 parent 879d76c commit 9a166e8

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

.gitlab-ci.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@
2727

2828
.only-branches: &only-branches
2929
except:
30-
- master
30+
- main
3131
- tags
3232
- triggers
3333

3434
.not-branches: &not-branches
3535
only:
36-
- master
36+
- main
3737
- tags
3838

3939
stages:
@@ -70,9 +70,9 @@ commitlint-branch:
7070
<<: *install-git
7171
<<: *dependency-npm
7272
script:
73-
- git fetch origin master --quiet
74-
- git checkout master --quiet
75-
- git reset --hard origin/master --quiet
73+
- git fetch origin main --quiet
74+
- git checkout main --quiet
75+
- git reset --hard origin/main --quiet
7676
- git checkout - --quiet
7777
- npm run compliance:commits
7878
<<: *only-branches

CONTRIBUTING.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ We ask you not to submit security concerns via GitHub. For details on submitting
1414

1515
We have a 3 step process for contributions:
1616

17-
1. Fork our repo and commit changes to a new branch based off `master`, making sure to sign-off those changes for the [Developer Certificate of Origin](#developer-certification-of-origin-dco).
17+
1. Fork our repo and commit changes to a new branch based off `main`, making sure to sign-off those changes for the [Developer Certificate of Origin](#developer-certification-of-origin-dco).
1818
2. Create a GitHub Pull Request for your change, following the instructions in the pull request template (if present).
1919
3. A [Code Review](#code-review-process) will then be undertaken by the project maintainers.
2020

@@ -33,7 +33,7 @@ Once you open a pull request, project maintainers will review your code and resp
3333

3434
1. Two thumbs-up (:+1:) are required from project maintainers.
3535
2. When ready, your pull request will be tagged with label `Ready For Merge`.
36-
3. Your change will be merged into the project's `master` branch and may be noted in the project's `CHANGELOG.md` at the time of release.
36+
3. Your change will be merged into the project's `main` branch and may be noted in the project's `CHANGELOG.md` at the time of release.
3737

3838
### Developer Certification of Origin (DCO)
3939

@@ -96,4 +96,4 @@ We follow the [Semantic Versioning](http://semver.org/) standard. Our standard v
9696

9797
## Acknowledgements
9898

99-
This guide was originally based upon the [InSpec Contribution Guide](https://github.com/chef/inspec/blob/master/CONTRIBUTING.md).
99+
This guide was originally based upon the [InSpec Contribution Guide](https://github.com/chef/inspec/blob/main/CONTRIBUTING.md).

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"main": "src/index.js",
3232
"scripts": {
3333
"compliance-tests": "npm run compliance:commits && npm run compliance:lint",
34-
"compliance:commits": "commitlint --from=master --to=HEAD",
34+
"compliance:commits": "commitlint --from=main --to=HEAD",
3535
"compliance:lint": "eslint --ignore-path .gitignore .",
3636
"pipeline": "npm run compliance-tests && npm run security-tests && npm run tests",
3737
"security-tests": "npm run security:outdated && npm run security:audit",

0 commit comments

Comments
 (0)