From d35cebbfa9334a71f4727431d667d6721225e06d Mon Sep 17 00:00:00 2001 From: Afonso Jorge Ramos Date: Tue, 9 Jul 2024 18:08:19 +0100 Subject: [PATCH 1/8] chore: fix link in contributing --- CONTRIBUTING.md | 1 + README.md | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e0b94e530..cc2d8aec9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -79,3 +79,4 @@ This project is a tool for monitoring new notifications from Github. It's not me [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/ From 2ed70677f53c1fa444cb3e4a7619fcbea909a4f5 Mon Sep 17 00:00:00 2001 From: Afonso Jorge Ramos Date: Tue, 9 Jul 2024 18:08:34 +0100 Subject: [PATCH 2/8] 5.10.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9e1863559..43f5a6883 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": { From 333a6f8e8bdb8a119eaac592871438c35f3403fe Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Tue, 9 Jul 2024 12:06:23 -0700 Subject: [PATCH 3/8] try using github_token --- .github/workflows/release.yml | 5 +++++ 1 file changed, 5 insertions(+) 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 From 42894632dc6a0390493bdba17224c3e63ee09872 Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Tue, 9 Jul 2024 12:19:27 -0700 Subject: [PATCH 4/8] update labeler for release branches --- .github/labeler.yml | 8 +++++++- .husky/pre-commit | 1 - 2 files changed, 7 insertions(+), 2 deletions(-) delete mode 100755 .husky/pre-commit diff --git a/.github/labeler.yml b/.github/labeler.yml index b90000d11..6bf0d89b1 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -24,6 +24,11 @@ labels: - label: 'build' matcher: title: '^(ci|build)(\(\w+\))?: .*' + branch: '^(?!release/.*$)' + + - label: 'release' + matcher: + branch: '^release/.*' - label: 'dependency' matcher: @@ -42,4 +47,5 @@ checks: - documentation - test - build - - dependency \ No newline at end of file + - dependency + - release \ No newline at end of file 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 From bc7299c963d6ebf2a45449568b0e72ee7e576224 Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Tue, 9 Jul 2024 12:30:14 -0700 Subject: [PATCH 5/8] update labeler for release branches --- .github/labeler.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index 6bf0d89b1..a52fe7026 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -2,35 +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+\))?: .*' - branch: '^(?!release/.*$)' + title: '^(ci|build)(\((?!release)\w+\))?: (?!.*\brelease\b).*' - label: 'release' + sync: true matcher: branch: '^release/.*' - label: 'dependency' + sync: true matcher: title: '^(deps)(\(\w+\))?: .*' From 77012e100f3873ad71ecbf8e71c0bf451a00953d Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Tue, 9 Jul 2024 12:39:21 -0700 Subject: [PATCH 6/8] docs: dependency dashboard --- CONTRIBUTING.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cc2d8aec9..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 Date: Tue, 9 Jul 2024 12:40:43 -0700 Subject: [PATCH 7/8] confirm if the permission was the magic --- .github/workflows/release.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0f002bbbc..045ddb9e4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,9 +6,6 @@ on: - 'release/v**' workflow_dispatch: # For manually running release process to verify codesigning of artifacts -permissions: - contents: write - jobs: release-macos: name: Publish macOS (electron-builder) From 089f7f814e425ddf7bb232564e8e4adcb0bb467c Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Tue, 9 Jul 2024 12:45:38 -0700 Subject: [PATCH 8/8] re-introduce permission --- .github/workflows/release.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 045ddb9e4..0f002bbbc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,6 +6,9 @@ on: - 'release/v**' workflow_dispatch: # For manually running release process to verify codesigning of artifacts +permissions: + contents: write + jobs: release-macos: name: Publish macOS (electron-builder)