Skip to content

Commit 963ff9f

Browse files
committed
Change references to master branch to main branch
I have already pushed `main` upstream pointing at the same commit as master, so this PR should be safe to merge. To the best of my knowledge all that's necessary after that is to change the default branch in https://github.com/github/vscode-codeql/settings/branches.
1 parent 1f3707f commit 963ff9f

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

.github/ISSUE_TEMPLATE/new-extension-release.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ assignees: ''
99
---
1010

1111
- [ ] Update this issue title to refer to the version of the release
12-
- [ ] Trigger a release build on Actions by adding a new tag on master of the format `vxx.xx.xx`
12+
- [ ] Trigger a release build on Actions by adding a new tag on branch `main` of the format `vxx.xx.xx`
1313
- [ ] Monitor the status of the release build in the `Release` workflow in the Actions tab.
1414
- [ ] Download the VSIX from the draft GitHub release that is created when the release build finishes.
1515
- [ ] Log into the [Visual Studio Marketplace](https://marketplace.visualstudio.com/manage/publishers/github).

.github/pull_request_template.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<!-- Thank you for submitting a pull request. Please read our pull request guidelines before
22
submitting your pull request:
3-
https://github.com/github/vscode-codeql/blob/master/CONTRIBUTING.md#submitting-a-pull-request.
3+
https://github.com/github/vscode-codeql/blob/main/CONTRIBUTING.md#submitting-a-pull-request.
44
-->
55

66
Replace this with a description of the changes your pull request makes.
77

88
## Checklist
99

10-
- [ ] [CHANGELOG.md](https://github.com/github/vscode-codeql/blob/master/extensions/ql-vscode/CHANGELOG.md) has been updated to incorporate all user visible changes made by this pull request.
10+
- [ ] [CHANGELOG.md](https://github.com/github/vscode-codeql/blob/main/extensions/ql-vscode/CHANGELOG.md) has been updated to incorporate all user visible changes made by this pull request.
1111
- [ ] Issues have been created for any UI or other user-facing changes made by this pull request.
1212
- [ ] `@github/product-docs-dsp` has been cc'd in all issues for UI or other user-facing changes made by this pull request.

.github/workflows/release.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,12 @@ jobs:
9393
asset_name: ${{ format('vscode-codeql-{0}.vsix', steps.prepare-artifacts.outputs.ref_name) }}
9494
asset_content_type: application/zip
9595

96-
# The checkout action does not fetch the master branch.
97-
# Fetch the master branch so that we can base the version bump PR against master.
98-
- name: Fetch master branch
96+
# The checkout action does not fetch the main branch.
97+
# Fetch the main branch so that we can base the version bump PR against main.
98+
- name: Fetch main branch
9999
run: |
100-
git fetch --depth=1 origin master:master
101-
git checkout master
100+
git fetch --depth=1 origin main:main
101+
git checkout main
102102
103103
- name: Bump patch version
104104
id: bump-patch-version
@@ -119,4 +119,4 @@ jobs:
119119
title: Bump version to ${{ steps.bump-patch-version.outputs.next_version }}
120120
body: This PR was automatically generated by the GitHub Actions release workflow in this repository.
121121
branch: ${{ format('version/bump-to-{0}', steps.bump-patch-version.outputs.next_version) }}
122-
base: master
122+
base: main

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ Alternatively, you can run the tests inside of vscode. There are several vscode
149149
1. Double-check that the extension `package.json` has the version you intend to release.
150150
If you are doing a patch release (as opposed to minor or major version) this should already
151151
be correct.
152-
1. Trigger a release build on Actions by adding a new tag on master of the format `vxx.xx.xx`
152+
1. Trigger a release build on Actions by adding a new tag on branch `main` of the format `vxx.xx.xx`
153153
1. Monitor the status of the release build in the `Release` workflow in the Actions tab.
154154
1. Download the VSIX from the draft GitHub release at the top of [the releases page](https://github.com/github/vscode-codeql/releases) that is created when the release build finishes.
155155
1. Optionally unzip the `.vsix` and inspect its `package.json` to make sure the version is what you expect,

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This project is an extension for Visual Studio Code that adds rich language supp
44

55
The extension is released. You can download it from the [Visual Studio Marketplace](https://marketplace.visualstudio.com/items?itemName=github.vscode-codeql).
66

7-
To see what has changed in the last few versions of the extension, see the [Changelog](https://github.com/github/vscode-codeql/blob/master/extensions/ql-vscode/CHANGELOG.md).
7+
To see what has changed in the last few versions of the extension, see the [Changelog](https://github.com/github/vscode-codeql/blob/main/extensions/ql-vscode/CHANGELOG.md).
88

99
[![CI status badge](https://github.com/github/vscode-codeql/workflows/Build%20Extension/badge.svg)](https://github.com/github/vscode-codeql/actions?query=workflow%3A%22Build+Extension%22+branch%3Amaster)
1010
[![VS Marketplace badge](https://vsmarketplacebadge.apphb.com/version/github.vscode-codeql.svg)](https://marketplace.visualstudio.com/items?itemName=github.vscode-codeql)

extensions/ql-vscode/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ This project is an extension for Visual Studio Code that adds rich language supp
77
- Provides an easy way to run queries from the large, open source repository of [CodeQL security queries](https://github.com/github/codeql).
88
- Adds IntelliSense to support you writing and editing your own CodeQL query and library files.
99

10-
To see what has changed in the last few versions of the extension, see the [Changelog](https://github.com/github/vscode-codeql/blob/master/extensions/ql-vscode/CHANGELOG.md).
10+
To see what has changed in the last few versions of the extension, see the [Changelog](https://github.com/github/vscode-codeql/blob/main/extensions/ql-vscode/CHANGELOG.md).
1111

1212
## Quick start overview
1313

0 commit comments

Comments
 (0)