Skip to content

Commit 3d1098f

Browse files
authored
Merge branch 'main' into release/v5.18.0
2 parents 75c9741 + 44ed91d commit 3d1098f

File tree

8 files changed

+76
-47
lines changed

8 files changed

+76
-47
lines changed
Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build App
1+
name: CI
22

33
on:
44
push:
@@ -9,9 +9,20 @@ on:
99
- main
1010

1111
jobs:
12+
lint:
13+
name: Lint App
14+
uses: ./.github/workflows/lint.yml
15+
16+
tests:
17+
name: Tests
18+
uses: ./.github/workflows/test.yml
19+
needs: lint
20+
1221
build-macos:
1322
name: Build macOS (electron-builder)
1423
runs-on: macos-latest
24+
needs: tests
25+
if: ${{ !startsWith(github.head_ref, 'release/v') }}
1526

1627
steps:
1728
- uses: actions/checkout@v4
@@ -38,6 +49,8 @@ jobs:
3849
build-windows:
3950
name: Build Windows (electron-builder)
4051
runs-on: windows-latest
52+
needs: tests
53+
if: ${{ !startsWith(github.head_ref, 'release/v') }}
4154

4255
steps:
4356
- uses: actions/checkout@v4
@@ -61,6 +74,8 @@ jobs:
6174
build-linux:
6275
name: Build Linux (electron-builder)
6376
runs-on: ubuntu-latest
77+
needs: tests
78+
if: ${{ !startsWith(github.head_ref, 'release/v') }}
6479

6580
steps:
6681
- uses: actions/checkout@v4

.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/release.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Release App
1+
name: Release
22

33
on:
44
push:
@@ -10,9 +10,19 @@ permissions:
1010
contents: write
1111

1212
jobs:
13+
lint:
14+
name: Lint App
15+
uses: ./.github/workflows/lint.yml
16+
17+
tests:
18+
name: Tests
19+
uses: ./.github/workflows/test.yml
20+
needs: lint
21+
1322
release-macos:
1423
name: Publish macOS (electron-builder)
1524
runs-on: macos-latest
25+
needs: tests
1626

1727
steps:
1828
- uses: actions/checkout@v4
@@ -45,6 +55,7 @@ jobs:
4555
release-windows:
4656
name: Publish Windows (electron-builder)
4757
runs-on: windows-latest
58+
needs: tests
4859

4960
steps:
5061
- uses: actions/checkout@v4
@@ -71,6 +82,7 @@ jobs:
7182
release-linux:
7283
name: Publish Linux (electron-builder)
7384
runs-on: ubuntu-latest
85+
needs: tests
7486

7587
steps:
7688
- uses: actions/checkout@v4

.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+
Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
1-
name: Validators
1+
name: Triage PR
22

33
on:
44
pull_request:
5-
types: [opened, edited, synchronize, reopened]
5+
types: [opened, edited, synchronize, ready_for_review]
6+
branches: [main]
7+
8+
permissions:
9+
contents: read # the config file
10+
pull-requests: write # for labeling pull requests (on: pull_request_target or on: pull_request)
11+
statuses: write # to generate status
12+
checks: write # to generate status
613

714
jobs:
815
pr-lint:
@@ -28,18 +35,9 @@ jobs:
2835
if (!match.groups.subject) {
2936
core.setFailed('Missing subject in PR title');
3037
}
31-
32-
renovate:
33-
name: Validate Renovate config
38+
39+
labeler:
40+
name: Auto-label PR
3441
runs-on: ubuntu-latest
3542
steps:
36-
- uses: actions/checkout@v4
37-
- uses: actions/setup-node@v4
38-
with:
39-
node-version-file: .nvmrc
40-
- uses: pnpm/action-setup@v3
41-
with:
42-
run_install: false
43-
- run: pnpm install --global renovate
44-
- name: Validate Renovate config
45-
run: renovate-config-validator
43+
- uses: fuxingloh/multi-labeler@v4

.github/workflows/website.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Update Website
33
on:
44
push:
55
tags: 'v*'
6-
workflow_dispatch: # For manually verify
6+
workflow_dispatch: # For manually verify website deployment
77

88
jobs:
99
redeploy-website:

0 commit comments

Comments
 (0)