From 33baec1be79a21be2300fc2013431f767d816d57 Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Thu, 2 Jan 2025 18:58:30 +0100 Subject: [PATCH 01/11] 5.18.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d52098b36..a1714f99a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gitify", - "version": "5.17.0", + "version": "5.18.0", "description": "GitHub notifications on your menu bar.", "main": "build/main.js", "scripts": { From 1e71c24b0c95c53963c3143fe987f32fb4db5c46 Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Tue, 14 Jan 2025 09:04:41 -0500 Subject: [PATCH 02/11] build: fix signing Signed-off-by: Adam Setch --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2c6bb7073..74e52e814 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,6 +4,7 @@ on: push: branches: - main + - 'release/v**' pull_request: branches: - main @@ -23,14 +24,12 @@ jobs: uses: ./.github/workflows/build.yml needs: tests if: ${{ !startsWith(github.head_ref, 'release/v') }} - secrets: inherit release: name: Release uses: ./.github/workflows/release.yml needs: tests if: ${{ startsWith(github.head_ref, 'release/v') }} - secrets: inherit permissions: contents: write From 39ba44cc33dee07aee771a985d7edbe6a81df0bc Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Tue, 14 Jan 2025 09:11:32 -0500 Subject: [PATCH 03/11] build: fix signing Signed-off-by: Adam Setch --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 74e52e814..6d60b02fc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,8 +6,7 @@ on: - main - 'release/v**' pull_request: - branches: - - main + branches-ignore: 'release/v**' jobs: lint: From 376434b3dd7e2e10a87d68bbc02a2d89a1ab66ee Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Tue, 14 Jan 2025 09:12:02 -0500 Subject: [PATCH 04/11] build: fix signing Signed-off-by: Adam Setch --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6d60b02fc..5dbe7f8a5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,7 @@ on: - main - 'release/v**' pull_request: - branches-ignore: 'release/v**' + branches-ignore: 'release/v**' # macOS code-signing only works on `push` events, not `pull_request` events jobs: lint: From b5a409d6458fb5b9eb4544cc843b49c065bc92ca Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Tue, 14 Jan 2025 09:13:48 -0500 Subject: [PATCH 05/11] build: fix signing Signed-off-by: Adam Setch --- .github/workflows/ci.yml | 5 +++-- .github/workflows/renovate.yml | 4 ++-- .github/workflows/website.yml | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5dbe7f8a5..302c69b2c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,9 +4,10 @@ on: push: branches: - main - - 'release/v**' + - release/v** pull_request: - branches-ignore: 'release/v**' # macOS code-signing only works on `push` events, not `pull_request` events + branches-ignore: + - release/v** # macOS code-signing only works on `push` events, not `pull_request` events jobs: lint: diff --git a/.github/workflows/renovate.yml b/.github/workflows/renovate.yml index fa590ffd0..7447afbd0 100644 --- a/.github/workflows/renovate.yml +++ b/.github/workflows/renovate.yml @@ -5,10 +5,10 @@ on: branches: - main paths: - - 'renovate.json' + - renovate.json pull_request: paths: - - 'renovate.json' + - renovate.json jobs: renovate-config-validator: diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml index f851df95e..e7739f01e 100644 --- a/.github/workflows/website.yml +++ b/.github/workflows/website.yml @@ -2,7 +2,8 @@ name: Website on: push: - tags: 'v*' + tags: + - v* workflow_dispatch: # For manually verify website deployment jobs: From 8aa241235e996ab85a5925184c8654f966190592 Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Tue, 14 Jan 2025 09:42:23 -0500 Subject: [PATCH 06/11] fix: macos code signing Signed-off-by: Adam Setch --- .github/workflows/ci.yml | 19 +++--- .github/workflows/publish.yml | 93 +++++++++++++++++++++++++++++ .github/workflows/release.yml | 108 ++++++---------------------------- 3 files changed, 120 insertions(+), 100 deletions(-) create mode 100644 .github/workflows/publish.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5befcaf7c..6972bb54d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,15 +4,20 @@ on: push: branches: - main - - release/v** pull_request: - branches-ignore: - - release/v*.*.* # macOS code-signing only works on `push` events, not `pull_request` events + branches: + - main jobs: + prepare: + name: Prepare + runs-on: ubuntu-latest + if: ${{ !startsWith(github.head_ref, 'release/v') }} + lint: name: Lint App uses: ./.github/workflows/lint.yml + needs: prepare tests: name: Tests @@ -23,14 +28,6 @@ jobs: name: Build uses: ./.github/workflows/build.yml needs: tests - if: ${{ !startsWith(github.head_ref, 'release/v') }} - release: - name: Release - uses: ./.github/workflows/release.yml - needs: tests - if: ${{ startsWith(github.head_ref, 'release/v') }} - permissions: - contents: write diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml new file mode 100644 index 000000000..05888b273 --- /dev/null +++ b/.github/workflows/publish.yml @@ -0,0 +1,93 @@ +name: Publish + +on: + workflow_call: + workflow_dispatch: # For manually running release process to verify code-signing of artifacts + +permissions: + contents: write + +jobs: + release-macos: + name: Publish macOS (electron-builder) + runs-on: macos-latest + + steps: + - uses: actions/checkout@v4 + - uses: pnpm/action-setup@v3 + - uses: actions/setup-node@v4 + with: + node-version-file: '.nvmrc' + cache: 'pnpm' + - run: pnpm install + - run: pnpm build + env: + OAUTH_CLIENT_ID: ${{ secrets.oauth_client_id }} + OAUTH_CLIENT_SECRET: ${{ secrets.oauth_client_secret }} + - run: pnpm prepare:remove-source-maps + - run: pnpm package:macos --publish onTagOrDraft + env: + APPLEID_USERNAME: ${{ secrets.appleid_username }} + APPLEID_PASSWORD: ${{ secrets.appleid_password }} + 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: + name: Gitify-release-mac + path: dist/ + overwrite: true + + release-windows: + name: Publish Windows (electron-builder) + runs-on: windows-latest + + steps: + - uses: actions/checkout@v4 + - uses: pnpm/action-setup@v3 + - uses: actions/setup-node@v4 + with: + node-version-file: '.nvmrc' + cache: 'pnpm' + - run: pnpm install + - run: pnpm build + env: + OAUTH_CLIENT_ID: ${{ secrets.oauth_client_id }} + OAUTH_CLIENT_SECRET: ${{ secrets.oauth_client_secret }} + - run: pnpm prepare:remove-source-maps + - run: pnpm package:win --publish onTagOrDraft + env: + GH_TOKEN: ${{ secrets.github_token }} + - uses: actions/upload-artifact@v4 + with: + name: Gitify-release-win + path: dist/ + overwrite: true + + release-linux: + name: Publish Linux (electron-builder) + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + - uses: pnpm/action-setup@v3 + - uses: actions/setup-node@v4 + with: + node-version-file: '.nvmrc' + cache: 'pnpm' + - run: pnpm install + - run: pnpm build + env: + OAUTH_CLIENT_ID: ${{ secrets.oauth_client_id }} + OAUTH_CLIENT_SECRET: ${{ secrets.oauth_client_secret }} + - run: pnpm prepare:remove-source-maps + - run: pnpm package:linux --publish onTagOrDraft + env: + GH_TOKEN: ${{ secrets.github_token }} + - uses: actions/upload-artifact@v4 + with: + name: Gitify-release-linux + path: dist/ + overwrite: true \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index af8949499..702ac0c8e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,93 +1,23 @@ name: Release -on: - workflow_call: - workflow_dispatch: # For manually running release process to verify code-signing of artifacts - -permissions: - contents: write +on: + push: + branches: + - release/v*.*.* jobs: - release-macos: - name: Publish macOS (electron-builder) - runs-on: macos-latest - - steps: - - uses: actions/checkout@v4 - - uses: pnpm/action-setup@v3 - - uses: actions/setup-node@v4 - with: - node-version-file: '.nvmrc' - cache: 'pnpm' - - run: pnpm install - - run: pnpm build - env: - OAUTH_CLIENT_ID: ${{ secrets.oauth_client_id }} - OAUTH_CLIENT_SECRET: ${{ secrets.oauth_client_secret }} - - run: pnpm prepare:remove-source-maps - - run: pnpm package:macos --publish onTagOrDraft - env: - APPLEID_USERNAME: ${{ secrets.appleid_username }} - APPLEID_PASSWORD: ${{ secrets.appleid_password }} - 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: - name: Gitify-release-mac - path: dist/ - overwrite: true - - release-windows: - name: Publish Windows (electron-builder) - runs-on: windows-latest - - steps: - - uses: actions/checkout@v4 - - uses: pnpm/action-setup@v3 - - uses: actions/setup-node@v4 - with: - node-version-file: '.nvmrc' - cache: 'pnpm' - - run: pnpm install - - run: pnpm build - env: - OAUTH_CLIENT_ID: ${{ secrets.oauth_client_id }} - OAUTH_CLIENT_SECRET: ${{ secrets.oauth_client_secret }} - - run: pnpm prepare:remove-source-maps - - run: pnpm package:win --publish onTagOrDraft - env: - GH_TOKEN: ${{ secrets.github_token }} - - uses: actions/upload-artifact@v4 - with: - name: Gitify-release-win - path: dist/ - overwrite: true - - release-linux: - name: Publish Linux (electron-builder) - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v4 - - uses: pnpm/action-setup@v3 - - uses: actions/setup-node@v4 - with: - node-version-file: '.nvmrc' - cache: 'pnpm' - - run: pnpm install - - run: pnpm build - env: - OAUTH_CLIENT_ID: ${{ secrets.oauth_client_id }} - OAUTH_CLIENT_SECRET: ${{ secrets.oauth_client_secret }} - - run: pnpm prepare:remove-source-maps - - run: pnpm package:linux --publish onTagOrDraft - env: - GH_TOKEN: ${{ secrets.github_token }} - - uses: actions/upload-artifact@v4 - with: - name: Gitify-release-linux - path: dist/ - overwrite: true \ No newline at end of file + lint: + name: Lint App + uses: ./.github/workflows/lint.yml + + tests: + name: Tests + uses: ./.github/workflows/test.yml + needs: lint + + release: + name: Release + uses: ./.github/workflows/release.yml + needs: tests + permissions: + contents: write From 799e156adfe6636c0a0cd9d6f2d8b62a0e0205b6 Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Tue, 14 Jan 2025 09:45:17 -0500 Subject: [PATCH 07/11] fix: macos code signing Signed-off-by: Adam Setch --- .github/workflows/ci.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6972bb54d..550af4790 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,25 +9,19 @@ on: - main jobs: - prepare: - name: Prepare - runs-on: ubuntu-latest - if: ${{ !startsWith(github.head_ref, 'release/v') }} - lint: name: Lint App uses: ./.github/workflows/lint.yml - needs: prepare + if: ${{ !startsWith(github.head_ref, 'release/v') }} tests: name: Tests uses: ./.github/workflows/test.yml needs: lint + if: ${{ !startsWith(github.head_ref, 'release/v') }} build: name: Build uses: ./.github/workflows/build.yml needs: tests - - - + if: ${{ !startsWith(github.head_ref, 'release/v') }} From 19b88a2c6cd323850d9a3d8836fe11d987035720 Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Tue, 14 Jan 2025 09:47:59 -0500 Subject: [PATCH 08/11] fix: macos code signing Signed-off-by: Adam Setch --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 702ac0c8e..8e06af393 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,8 +16,8 @@ jobs: needs: lint release: - name: Release - uses: ./.github/workflows/release.yml + name: Publish + uses: ./.github/workflows/publish.yml needs: tests permissions: contents: write From 90dc3377f13457b16bbf5cd1c36c499684dc5472 Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Tue, 14 Jan 2025 09:55:50 -0500 Subject: [PATCH 09/11] fix: macos code signing Signed-off-by: Adam Setch --- .github/workflows/ci.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 550af4790..b4e10b633 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,19 +9,24 @@ on: - main jobs: + prepare: + if: ${{ !startsWith(github.head_ref, 'release/v') }} + name: Prepare CI + runs-on: ubuntu-latest + steps: + - run: echo Running CI for branch ${{ github.head_ref }} + lint: name: Lint App uses: ./.github/workflows/lint.yml - if: ${{ !startsWith(github.head_ref, 'release/v') }} + needs: prepare tests: name: Tests uses: ./.github/workflows/test.yml needs: lint - if: ${{ !startsWith(github.head_ref, 'release/v') }} build: name: Build uses: ./.github/workflows/build.yml needs: tests - if: ${{ !startsWith(github.head_ref, 'release/v') }} From da568a1d415139c0d91c609228021f2cacd0c726 Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Tue, 14 Jan 2025 09:57:58 -0500 Subject: [PATCH 10/11] fix: macos code signing Signed-off-by: Adam Setch --- .github/workflows/ci.yml | 1 + .github/workflows/release.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b4e10b633..69d500b37 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,3 +30,4 @@ jobs: name: Build uses: ./.github/workflows/build.yml needs: tests + secrets: inherit diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8e06af393..5756970ab 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,5 +19,6 @@ jobs: name: Publish uses: ./.github/workflows/publish.yml needs: tests + secrets: inherit permissions: contents: write From aae394300e76d2bc8a8505d7a77906f189077a5a Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Tue, 14 Jan 2025 10:15:17 -0500 Subject: [PATCH 11/11] fix: macos code signing Signed-off-by: Adam Setch --- .github/workflows/ci.yml | 4 ++-- .github/workflows/release.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 69d500b37..b62660f7b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,8 +9,8 @@ on: - main jobs: - prepare: - if: ${{ !startsWith(github.head_ref, 'release/v') }} + prepare: # macOS code-signing only works on `push` events and not `pull_request` events + if: ${{ !startsWith(github.head_ref, 'release/v') }} name: Prepare CI runs-on: ubuntu-latest steps: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5756970ab..95db3cb43 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,7 +3,7 @@ name: Release on: push: branches: - - release/v*.*.* + - release/v*.*.* # macOS code-signing only works on `push` events and not `pull_request` events jobs: lint: