diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml index 032042f..078ab65 100644 --- a/.github/workflows/draft-release.yml +++ b/.github/workflows/draft-release.yml @@ -4,13 +4,13 @@ on: push: # branches to consider in the event; optional, defaults to all branches: - - master + - main jobs: update-release-draft: runs-on: ubuntu-latest steps: - # Drafts your next Release notes as Pull Requests are merged into "master" + # Drafts your next Release notes as Pull Requests are merged into "main" - uses: release-drafter/release-drafter@v6 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/generate-changelog.yml b/.github/workflows/generate-changelog.yml index dc1aecc..5d8f721 100644 --- a/.github/workflows/generate-changelog.yml +++ b/.github/workflows/generate-changelog.yml @@ -11,18 +11,18 @@ jobs: steps: - uses: actions/checkout@v6.0.2 with: - ref: master + ref: main - name: Generate changelog uses: charmixer/auto-changelog-action@v1 with: token: ${{ secrets.GITHUB_TOKEN }} - release_branch: master + release_branch: main - name: Create Pull Request uses: peter-evans/create-pull-request@v8.1.0 with: - base: master + base: main token: ${{ secrets.GITHUB_TOKEN }} commit-message: Update changelog title: Update changelog diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 068f557..4841271 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,9 +5,9 @@ name: Test application on: push: - branches: [master] + branches: [main] pull_request: - branches: [master] + branches: [main] jobs: build: diff --git a/RELEASE.md b/RELEASE.md index 4a71b3f..bf5f86e 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,9 +1,9 @@ # Release procedure -- Create a release branch from master. +- Create a release branch from main. - Update version in `VERSION`to the new version number, eg `'0.2.0'`. - Commit with commit message `Bump version to 0.2.0` and push the release branch to origin. -- Create a pull request from release branch to `master` with the commit message as title. -- Squash merge the pull request into `master`. +- Create a pull request from release branch to `main` with the commit message as title. +- Squash merge the pull request into `main`. - Wait for all GitHub actions to have run successfully. -- Go to GitHub releases page and publish the current draft release, setting the correct title and tag version from master branch. Use a `v` prefix for the tag but not for the release title. +- Go to GitHub releases page and publish the current draft release, setting the correct title and tag version from main branch. Use a `v` prefix for the tag but not for the release title.