diff --git a/.github/workflows/check-dist.yml b/.github/workflows/check-dist.yml index 9959ea9..3397c84 100644 --- a/.github/workflows/check-dist.yml +++ b/.github/workflows/check-dist.yml @@ -9,7 +9,6 @@ on: push: branches: - main - - master paths-ignore: - '**.md' pull_request: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6231103..f9746b8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,7 +3,7 @@ on: # rebuild any PRs and main branch changes pull_request: push: branches: - - master + - main - 'releases/*' jobs: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index edf2f66..06f9747 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -2,10 +2,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: '24 4 * * 6' diff --git a/RELEASING.md b/RELEASING.md index 303b013..2595abb 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -1,15 +1,11 @@ # Release -* starting on `master` +* starting on `main` * `npm install` * `npm run all` -* `git checkout releases/v1` -* `git merge master` -* `npm prune --production` -* `git add -f node_modules` - * if changed dependencies `git commit -m Dependencies && git push` +* Commit and push any changes to the `dist` directory. Wait for CI. * `git tag v1.0.x && git push --tags` with the actual version number -* `git tag --delete v1 && git push --delete origin v1 && git tag v1 && git push --tags` +* `git tag -f -a v1 && git push -f --tags` * go to https://github.com/gradle/wrapper-validation-action/releases * edit and publish the now drafted `v1` release * create a new release from the new full version number `v1.0.x`, list the fixed issues and publish the release