Skip to content

Commit

Permalink
fix: Switch over to main from master (#181)
Browse files Browse the repository at this point in the history
  • Loading branch information
DarthHater authored Feb 3, 2021
1 parent 70d8053 commit 4ae7681
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
command: npm i -g vsce semantic-release @semantic-release/changelog @semantic-release/[email protected] @semantic-release/npm
- run:
name: Attempt publish to GitHub
command: npx semantic-release -b master
command: npx semantic-release -b main
- run:
name: Publish to Visual Studio Code Extension Marketplace
command: vsce publish -p $VSCODE_TOKEN
Expand All @@ -51,7 +51,7 @@ workflows:
- release:
filters:
branches:
only: master
only: main
context: vscode-plugin
requires:
- build
Expand All @@ -62,6 +62,6 @@ workflows:
cron: "20 20 * * *"
filters:
branches:
only: master
only: main
jobs:
- build
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -131,13 +131,13 @@ We care a lot about making the world a safer place, and that's why we created th
## Releasing

We use [semantic-release](https://github.com/semantic-release/semantic-release) to generate releases. For example,
to perform a "patch" release, add a commit to master with a comment like:
to perform a "patch" release, add a commit to main with a comment like:

```
fix: `policyViolations of undefined` when loading a python project with requirements.txt (see Issue #127)
```

Without such a commit comment, commits to the `master` branch will cause a build failure during the release
Without such a commit comment, commits to the `main` branch will cause a build failure during the release
process due to an attempt to reuse an existing version number.

To avoid such build failures without performing a release, be sure your commit message includes `[skip ci] `.
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"type": "git",
"url": "https://github.com/sonatype-nexus-community/vscode-iq-plugin.git"
},
"homepage": "https://github.com/sonatype-nexus-community/vscode-iq-plugin/blob/master/README.md",
"homepage": "https://github.com/sonatype-nexus-community/vscode-iq-plugin/blob/main/README.md",
"bugs": {
"url": "https://github.com/sonatype-nexus-community/vscode-iq-plugin/issues",
"email": "[email protected]"
Expand Down

0 comments on commit 4ae7681

Please sign in to comment.