From 963ff9f45847545b6c93fafaaf7764c4783775dd Mon Sep 17 00:00:00 2001 From: Jason Reed Date: Tue, 16 Jun 2020 14:00:02 -0400 Subject: [PATCH] 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. --- .github/ISSUE_TEMPLATE/new-extension-release.md | 2 +- .github/pull_request_template.md | 4 ++-- .github/workflows/release.yml | 12 ++++++------ CONTRIBUTING.md | 2 +- README.md | 2 +- extensions/ql-vscode/README.md | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/new-extension-release.md b/.github/ISSUE_TEMPLATE/new-extension-release.md index 94da7a353..02ce2a565 100644 --- a/.github/ISSUE_TEMPLATE/new-extension-release.md +++ b/.github/ISSUE_TEMPLATE/new-extension-release.md @@ -9,7 +9,7 @@ assignees: '' --- - [ ] Update this issue title to refer to the version of the release -- [ ] Trigger a release build on Actions by adding a new tag on master of the format `vxx.xx.xx` +- [ ] Trigger a release build on Actions by adding a new tag on branch `main` of the format `vxx.xx.xx` - [ ] Monitor the status of the release build in the `Release` workflow in the Actions tab. - [ ] Download the VSIX from the draft GitHub release that is created when the release build finishes. - [ ] Log into the [Visual Studio Marketplace](https://marketplace.visualstudio.com/manage/publishers/github). diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 1a897c8d9..86a130c60 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,12 +1,12 @@ Replace this with a description of the changes your pull request makes. ## Checklist -- [ ] [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. +- [ ] [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. - [ ] Issues have been created for any UI or other user-facing changes made by this pull request. - [ ] `@github/product-docs-dsp` has been cc'd in all issues for UI or other user-facing changes made by this pull request. diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 94115a98c..cae893463 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -93,12 +93,12 @@ jobs: asset_name: ${{ format('vscode-codeql-{0}.vsix', steps.prepare-artifacts.outputs.ref_name) }} asset_content_type: application/zip - # The checkout action does not fetch the master branch. - # Fetch the master branch so that we can base the version bump PR against master. - - name: Fetch master branch + # The checkout action does not fetch the main branch. + # Fetch the main branch so that we can base the version bump PR against main. + - name: Fetch main branch run: | - git fetch --depth=1 origin master:master - git checkout master + git fetch --depth=1 origin main:main + git checkout main - name: Bump patch version id: bump-patch-version @@ -119,4 +119,4 @@ jobs: title: Bump version to ${{ steps.bump-patch-version.outputs.next_version }} body: This PR was automatically generated by the GitHub Actions release workflow in this repository. branch: ${{ format('version/bump-to-{0}', steps.bump-patch-version.outputs.next_version) }} - base: master + base: main diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cfaa9f554..553f1df55 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -149,7 +149,7 @@ Alternatively, you can run the tests inside of vscode. There are several vscode 1. Double-check that the extension `package.json` has the version you intend to release. If you are doing a patch release (as opposed to minor or major version) this should already be correct. -1. Trigger a release build on Actions by adding a new tag on master of the format `vxx.xx.xx` +1. Trigger a release build on Actions by adding a new tag on branch `main` of the format `vxx.xx.xx` 1. Monitor the status of the release build in the `Release` workflow in the Actions tab. 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. 1. Optionally unzip the `.vsix` and inspect its `package.json` to make sure the version is what you expect, diff --git a/README.md b/README.md index 7ace8f6ef..f7c5959f0 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ This project is an extension for Visual Studio Code that adds rich language supp The extension is released. You can download it from the [Visual Studio Marketplace](https://marketplace.visualstudio.com/items?itemName=github.vscode-codeql). -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). +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). [![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) [![VS Marketplace badge](https://vsmarketplacebadge.apphb.com/version/github.vscode-codeql.svg)](https://marketplace.visualstudio.com/items?itemName=github.vscode-codeql) diff --git a/extensions/ql-vscode/README.md b/extensions/ql-vscode/README.md index 15de82072..37d759234 100644 --- a/extensions/ql-vscode/README.md +++ b/extensions/ql-vscode/README.md @@ -7,7 +7,7 @@ This project is an extension for Visual Studio Code that adds rich language supp - Provides an easy way to run queries from the large, open source repository of [CodeQL security queries](https://github.com/github/codeql). - Adds IntelliSense to support you writing and editing your own CodeQL query and library files. -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). +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). ## Quick start overview