Skip to content

Commit f543d92

Browse files
setchysetchy
committed
Merge branch 'main' into refactor/primer-design-system
Signed-off-by: Adam Setch <[email protected]>
2 parents 835e46a + 595815a commit f543d92

File tree

75 files changed

+5797
-2004
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+5797
-2004
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.yml‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,18 @@ body:
1313
required: true
1414

1515
- type: textarea
16+
id: description
1617
attributes:
1718
label: 📝 Description
18-
description: List steps to reproduce the error and details on what happens and what you expected to happen.
19+
description: Describe what happens and what you expected to happen.
1920
validations:
2021
required: true
2122

2223
- type: textarea
2324
id: steps-to-reproduce
2425
attributes:
2526
label: 🪜 Steps To Reproduce
26-
description: Steps to reproduce the behavior.
27+
description: List out steps to reproduce the behavior.
2728
placeholder: |
2829
1. Go to '...'
2930
2. Click on '...'
@@ -32,6 +33,14 @@ body:
3233
validations:
3334
required: true
3435

36+
- type: textarea
37+
id: logs
38+
attributes:
39+
label: 🪵 Log Excerpts
40+
description: Share any relevant log excerpts where available - see https://gitify.io/faq
41+
validations:
42+
required: false
43+
3544
- type: input
3645
id: app-version
3746
attributes:

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
1-
name: Build App
1+
name: Build
22

33
on:
4-
push:
5-
branches:
6-
- main
7-
pull_request:
8-
branches:
9-
- main
4+
workflow_call:
105

116
jobs:
127
build-macos:

‎.github/workflows/ci.yml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
pull_request:
8+
branches:
9+
- main
10+
11+
jobs:
12+
prepare: # macOS code-signing only works on `push` events and not `pull_request` events
13+
if: ${{ !startsWith(github.head_ref, 'release/v') }}
14+
name: Prepare CI
15+
runs-on: ubuntu-latest
16+
steps:
17+
- run: echo Running CI for branch ${{ github.head_ref }}
18+
19+
lint:
20+
name: Lint App
21+
uses: ./.github/workflows/lint.yml
22+
needs: prepare
23+
24+
tests:
25+
name: Tests
26+
uses: ./.github/workflows/test.yml
27+
needs: lint
28+
29+
build:
30+
name: Build
31+
uses: ./.github/workflows/build.yml
32+
needs: tests
33+
secrets: inherit

‎.github/workflows/lint.yml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
name: Linting
1+
name: Lint
22

33
on:
4-
push:
5-
branches:
6-
- main
7-
pull_request:
4+
workflow_call:
85

96
jobs:
107
lint:
@@ -20,3 +17,4 @@ jobs:
2017
cache: 'pnpm'
2118
- run: pnpm install
2219
- run: pnpm lint:check
20+

‎.github/workflows/pr-triage.yml‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎.github/workflows/publish.yml‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
name: Publish
2+
3+
on:
4+
workflow_call:
5+
workflow_dispatch: # For manually running release process to verify code-signing of artifacts
6+
7+
permissions:
8+
contents: write
9+
10+
jobs:
11+
release-macos:
12+
name: Publish macOS (electron-builder)
13+
runs-on: macos-latest
14+
15+
steps:
16+
- uses: actions/checkout@v4
17+
- uses: pnpm/action-setup@v3
18+
- uses: actions/setup-node@v4
19+
with:
20+
node-version-file: '.nvmrc'
21+
cache: 'pnpm'
22+
- run: pnpm install
23+
- run: pnpm build
24+
env:
25+
OAUTH_CLIENT_ID: ${{ secrets.oauth_client_id }}
26+
OAUTH_CLIENT_SECRET: ${{ secrets.oauth_client_secret }}
27+
- run: pnpm prepare:remove-source-maps
28+
- run: pnpm package:macos --publish onTagOrDraft
29+
env:
30+
APPLEID_USERNAME: ${{ secrets.appleid_username }}
31+
APPLEID_PASSWORD: ${{ secrets.appleid_password }}
32+
APPLEID_TEAM_ID: ${{ secrets.appleid_teamid }}
33+
CSC_LINK: ${{ secrets.mac_certs }}
34+
CSC_KEY_PASSWORD: ${{ secrets.mac_certs_password }}
35+
GH_TOKEN: ${{ secrets.github_token }}
36+
NOTARIZE: true
37+
- uses: actions/upload-artifact@v4
38+
with:
39+
name: Gitify-release-mac
40+
path: dist/
41+
overwrite: true
42+
43+
release-windows:
44+
name: Publish Windows (electron-builder)
45+
runs-on: windows-latest
46+
47+
steps:
48+
- uses: actions/checkout@v4
49+
- uses: pnpm/action-setup@v3
50+
- uses: actions/setup-node@v4
51+
with:
52+
node-version-file: '.nvmrc'
53+
cache: 'pnpm'
54+
- run: pnpm install
55+
- run: pnpm build
56+
env:
57+
OAUTH_CLIENT_ID: ${{ secrets.oauth_client_id }}
58+
OAUTH_CLIENT_SECRET: ${{ secrets.oauth_client_secret }}
59+
- run: pnpm prepare:remove-source-maps
60+
- run: pnpm package:win --publish onTagOrDraft
61+
env:
62+
GH_TOKEN: ${{ secrets.github_token }}
63+
- uses: actions/upload-artifact@v4
64+
with:
65+
name: Gitify-release-win
66+
path: dist/
67+
overwrite: true
68+
69+
release-linux:
70+
name: Publish Linux (electron-builder)
71+
runs-on: ubuntu-latest
72+
73+
steps:
74+
- uses: actions/checkout@v4
75+
- uses: pnpm/action-setup@v3
76+
- uses: actions/setup-node@v4
77+
with:
78+
node-version-file: '.nvmrc'
79+
cache: 'pnpm'
80+
- run: pnpm install
81+
- run: pnpm build
82+
env:
83+
OAUTH_CLIENT_ID: ${{ secrets.oauth_client_id }}
84+
OAUTH_CLIENT_SECRET: ${{ secrets.oauth_client_secret }}
85+
- run: pnpm prepare:remove-source-maps
86+
- run: pnpm package:linux --publish onTagOrDraft
87+
env:
88+
GH_TOKEN: ${{ secrets.github_token }}
89+
- uses: actions/upload-artifact@v4
90+
with:
91+
name: Gitify-release-linux
92+
path: dist/
93+
overwrite: true

‎.github/workflows/release.yml‎

Lines changed: 18 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -1,95 +1,24 @@
1-
name: Release App
1+
name: Release
22

33
on:
44
push:
55
branches:
6-
- 'release/v**'
7-
workflow_dispatch: # For manually running release process to verify codesigning of artifacts
8-
9-
permissions:
10-
contents: write
6+
- release/v*.*.* # macOS code-signing only works on `push` events and not `pull_request` events
117

128
jobs:
13-
release-macos:
14-
name: Publish macOS (electron-builder)
15-
runs-on: macos-latest
16-
17-
steps:
18-
- uses: actions/checkout@v4
19-
- uses: pnpm/action-setup@v3
20-
- uses: actions/setup-node@v4
21-
with:
22-
node-version-file: '.nvmrc'
23-
cache: 'pnpm'
24-
- run: pnpm install
25-
- run: pnpm build
26-
env:
27-
OAUTH_CLIENT_ID: ${{ secrets.oauth_client_id }}
28-
OAUTH_CLIENT_SECRET: ${{ secrets.oauth_client_secret }}
29-
- run: pnpm prepare:remove-source-maps
30-
- run: pnpm package:macos --publish onTagOrDraft
31-
env:
32-
APPLEID_USERNAME: ${{ secrets.appleid_username }}
33-
APPLEID_PASSWORD: ${{ secrets.appleid_password }}
34-
APPLEID_TEAM_ID: ${{ secrets.appleid_teamid }}
35-
CSC_LINK: ${{ secrets.mac_certs }}
36-
CSC_KEY_PASSWORD: ${{ secrets.mac_certs_password }}
37-
GH_TOKEN: ${{ secrets.github_token }}
38-
NOTARIZE: true
39-
- uses: actions/upload-artifact@v4
40-
with:
41-
name: Gitify-release-mac
42-
path: dist/
43-
overwrite: true
44-
45-
release-windows:
46-
name: Publish Windows (electron-builder)
47-
runs-on: windows-latest
48-
49-
steps:
50-
- uses: actions/checkout@v4
51-
- uses: pnpm/action-setup@v3
52-
- uses: actions/setup-node@v4
53-
with:
54-
node-version-file: '.nvmrc'
55-
cache: 'pnpm'
56-
- run: pnpm install
57-
- run: pnpm build
58-
env:
59-
OAUTH_CLIENT_ID: ${{ secrets.oauth_client_id }}
60-
OAUTH_CLIENT_SECRET: ${{ secrets.oauth_client_secret }}
61-
- run: pnpm prepare:remove-source-maps
62-
- run: pnpm package:win --publish onTagOrDraft
63-
env:
64-
GH_TOKEN: ${{ secrets.github_token }}
65-
- uses: actions/upload-artifact@v4
66-
with:
67-
name: Gitify-release-win
68-
path: dist/
69-
overwrite: true
70-
71-
release-linux:
72-
name: Publish Linux (electron-builder)
73-
runs-on: ubuntu-latest
74-
75-
steps:
76-
- uses: actions/checkout@v4
77-
- uses: pnpm/action-setup@v3
78-
- uses: actions/setup-node@v4
79-
with:
80-
node-version-file: '.nvmrc'
81-
cache: 'pnpm'
82-
- run: pnpm install
83-
- run: pnpm build
84-
env:
85-
OAUTH_CLIENT_ID: ${{ secrets.oauth_client_id }}
86-
OAUTH_CLIENT_SECRET: ${{ secrets.oauth_client_secret }}
87-
- run: pnpm prepare:remove-source-maps
88-
- run: pnpm package:linux --publish onTagOrDraft
89-
env:
90-
GH_TOKEN: ${{ secrets.github_token }}
91-
- uses: actions/upload-artifact@v4
92-
with:
93-
name: Gitify-release-linux
94-
path: dist/
95-
overwrite: true
9+
lint:
10+
name: Lint App
11+
uses: ./.github/workflows/lint.yml
12+
13+
tests:
14+
name: Tests
15+
uses: ./.github/workflows/test.yml
16+
needs: lint
17+
18+
publish:
19+
name: Publish
20+
uses: ./.github/workflows/publish.yml
21+
needs: tests
22+
secrets: inherit
23+
permissions:
24+
contents: write

‎.github/workflows/renovate.yml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Renovate
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
paths:
8+
- renovate.json
9+
pull_request:
10+
paths:
11+
- renovate.json
12+
13+
jobs:
14+
renovate-config-validator:
15+
name: Config validation
16+
runs-on: ubuntu-latest
17+
steps:
18+
- uses: actions/checkout@v4
19+
- uses: actions/setup-node@v4
20+
with:
21+
node-version-file: .nvmrc
22+
- uses: pnpm/action-setup@v3
23+
with:
24+
run_install: false
25+
- run: pnpm install --global renovate
26+
- name: Validate Renovate config
27+
run: renovate-config-validator

‎.github/workflows/test.yml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
name: Run Tests
1+
name: Test
22

33
on:
4-
push:
5-
branches:
6-
- main
7-
pull_request:
4+
workflow_call:
85

96
jobs:
107
run-unit-tests:
@@ -23,3 +20,4 @@ jobs:
2320
- run: pnpm test -- --coverage --runInBand --verbose
2421
- name: Coveralls
2522
uses: coverallsapp/github-action@v2
23+

0 commit comments

Comments
 (0)