From ac894c38aa1a903bfaf941e422c2c1fb90057bf1 Mon Sep 17 00:00:00 2001 From: Keegan Campbell Date: Tue, 10 Jan 2023 10:42:12 -0800 Subject: [PATCH] Default branch rename (#533) * Default branch rename * Add package.json main branch release config --- .github/pull_request_template.md | 14 +++++++------- .github/workflows/codeql-analysis.yml | 10 +++++----- .github/workflows/release.yml | 2 +- .github/workflows/test.yml | 2 +- .github/workflows/update.yml | 2 +- package.json | 9 +++++++++ 6 files changed, 24 insertions(+), 15 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index dc0794ae..e2327ae4 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -11,18 +11,18 @@ Resolves #ISSUE_NUMBER ### Before the change? -* +* ### After the change? -* +* ### Other information -* +* ---- @@ -36,20 +36,20 @@ Resolves #ISSUE_NUMBER ### Does this introduce a breaking change? -Please see our docs on [breaking changes](https://github.com/octokit/.github/blob/master/community/breaking_changes.md) to help! +Please see our docs on [breaking changes](https://github.com/octokit/.github/blob/main/community/breaking_changes.md) to help! - [ ] Yes (Please add the `Type: Breaking change` label) - [ ] No -If `Yes`, what's the impact: +If `Yes`, what's the impact: * N/A ### Pull request type - - + + Please add the corresponding label for change this PR introduces: - Bugfix: `Type: Bug` diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 02567324..50927841 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -13,10 +13,10 @@ name: "CodeQL" on: push: - branches: [ "master" ] + branches: [ "main" ] pull_request: # The branches below must be a subset of the branches above - branches: [ "master" ] + branches: [ "main" ] schedule: - cron: '15 13 * * 3' @@ -48,11 +48,11 @@ jobs: # If you wish to specify custom queries, you can do so here or in a config file. # By default, queries listed here will override any specified in a config file. # Prefix the list here with "+" to use these queries and those in the config file. - + # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs # queries: security-extended,security-and-quality - + # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild @@ -61,7 +61,7 @@ jobs: # ℹī¸ Command-line programs to run using the OS shell. # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun - # If the Autobuild fails above, remove it and uncomment the following three lines. + # If the Autobuild fails above, remove it and uncomment the following three lines. # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance. # - run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e570319a..8703c436 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,7 +1,7 @@ "on": push: branches: - - master + - main name: Release jobs: build: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d2d03267..289c3da8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,7 +2,7 @@ name: Test "on": push: branches: - - master + - main pull_request: types: - opened diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 3d88cb22..1a100bc5 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -68,7 +68,7 @@ jobs: Make sure to update the commits so that the merge results in helpful release notes, see [Merging the Pull Request & releasing a new - version](https://github.com/octokit/rest.js/blob/master/CONTRIBUTING.md#merging-the-pull-request--releasing-a-new-version). + version](https://github.com/octokit/rest.js/blob/main/CONTRIBUTING.md#merging-the-pull-request--releasing-a-new-version). In general diff --git a/package.json b/package.json index c148e629..cbf800b6 100644 --- a/package.json +++ b/package.json @@ -71,6 +71,15 @@ ] }, "release": { + "branches": [ + "+([0-9]).x", + "main", + "next", + { + "name": "beta", + "prerelease": true + } + ], "plugins": [ "@semantic-release/commit-analyzer", "@semantic-release/release-notes-generator",