From 5791801b2f4145a96e4bf5fb9921abf1602d44f4 Mon Sep 17 00:00:00 2001 From: Afonso Jorge Ramos Date: Tue, 9 Jul 2024 21:00:35 +0100 Subject: [PATCH] build(release): `v5.10.0` (#1349) * chore: fix link in contributing * 5.10.0 * try using github_token * update labeler for release branches * update labeler for release branches * docs: dependency dashboard * confirm if the permission was the magic * re-introduce permission --------- Co-authored-by: Adam Setch --- .github/labeler.yml | 17 +++++++++++++++-- .github/workflows/release.yml | 5 +++++ .husky/pre-commit | 1 - CONTRIBUTING.md | 14 ++++++++------ README.md | 1 - package.json | 2 +- 6 files changed, 29 insertions(+), 11 deletions(-) delete mode 100755 .husky/pre-commit diff --git a/.github/labeler.yml b/.github/labeler.yml index b90000d11..a52fe7026 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -2,30 +2,42 @@ version: v1 labels: - label: 'enhancement' + sync: true matcher: title: '^feat(\(\w+\))?: .*' - label: 'bug' + sync: true matcher: title: '^fix(\(\w+\))?: .*' - label: 'refactor' + sync: true matcher: title: '^refactor(\(\w+\))?: .*' - label: 'documentation' + sync: true matcher: title: '^docs(\(\w+\))?: .*' - label: 'test' + sync: true matcher: title: '^test(\(\w+\))?: .*' - label: 'build' + sync: true matcher: - title: '^(ci|build)(\(\w+\))?: .*' + title: '^(ci|build)(\((?!release)\w+\))?: (?!.*\brelease\b).*' + + - label: 'release' + sync: true + matcher: + branch: '^release/.*' - label: 'dependency' + sync: true matcher: title: '^(deps)(\(\w+\))?: .*' @@ -42,4 +54,5 @@ checks: - documentation - test - build - - dependency \ No newline at end of file + - dependency + - release \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 744575781..0f002bbbc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -33,6 +33,7 @@ jobs: APPLEID_TEAM_ID: ${{ secrets.appleid_teamid }} CSC_LINK: ${{ secrets.mac_certs }} CSC_KEY_PASSWORD: ${{ secrets.mac_certs_password }} + GH_TOKEN: ${{ secrets.github_token }} NOTARIZE: true - uses: actions/upload-artifact@v4 with: @@ -57,6 +58,8 @@ jobs: OAUTH_CLIENT_ID: ${{ secrets.oauth_client_id }} OAUTH_CLIENT_SECRET: ${{ secrets.oauth_client_secret }} - run: pnpm make:win --publish onTagOrDraft + env: + GH_TOKEN: ${{ secrets.github_token }} - uses: actions/upload-artifact@v4 with: name: Gitify-release-win @@ -80,6 +83,8 @@ jobs: OAUTH_CLIENT_ID: ${{ secrets.oauth_client_id }} OAUTH_CLIENT_SECRET: ${{ secrets.oauth_client_secret }} - run: pnpm make:linux --publish onTagOrDraft + env: + GH_TOKEN: ${{ secrets.github_token }} - uses: actions/upload-artifact@v4 with: name: Gitify-release-linux diff --git a/.husky/pre-commit b/.husky/pre-commit deleted file mode 100755 index fcbcaa658..000000000 --- a/.husky/pre-commit +++ /dev/null @@ -1 +0,0 @@ -pnpx lint-staged \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e0b94e530..11e99d304 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -55,12 +55,13 @@ pnpm test -- --watch The release process is automated. Follow the steps below. 1. Verify that all features you want targeted in the release have been merged to `main`. -2. Create a [new **draft** release][github-new-release]. Set the tag version to something with the format of `v1.2.3`. Save as a **draft** before moving to the next step -3. Create a branch that starts with `release/vX.X.X` (ie. `release/v1.2.3`). -4. In the same branch, **bump the version** of the app by running `pnpm version [biome-website]: https://biomejs.dev/ [jest-website]: https://jestjs.io/ +[github-new-release]: https://github.com/gitify-app/gitify/releases/new diff --git a/README.md b/README.md index d08436919..060645e25 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,6 @@ For more information, see [LICENSE](LICENSE). [github]: https://github.com/gitify-app/gitify [github-actions]: https://github.com/gitify-app/gitify/actions [github-releases]: https://github.com/gitify-app/gitify/releases/latest -[github-new-release]: https://github.com/gitify-app/gitify/releases/new [github-website]: https://github.com/gitify-app/website [github-website-pulls]: https://github.com/gitify-app/website/pulls [brew]: http://brew.sh/ diff --git a/package.json b/package.json index 15453a193..adafa6702 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gitify", - "version": "5.9.0", + "version": "5.10.0", "description": "GitHub Notifications on your menu bar.", "main": "src/electron/main.js", "scripts": {