Skip to content

Commit 65efc75

Browse files
committed
updated workflow files
1 parent 259cf14 commit 65efc75

3 files changed

Lines changed: 23 additions & 29 deletions

File tree

.github/workflows/beta.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
name: Beta
1+
name: release-beta
22

33
on:
44
workflow_run:
5-
workflows: ["Test"]
5+
workflows: ["tests", "linter"]
66
types: [completed]
77
push:
88
branches: ["beta"]
@@ -14,9 +14,7 @@ permissions:
1414

1515
jobs:
1616
release:
17-
if: >
18-
github.event.workflow_run.conclusion == 'success' &&
19-
github.event.workflow_run.head_branch == 'beta'
17+
if: github.event.pull_request.merged == true
2018
runs-on: ubuntu-latest
2119
steps:
2220
- name: Checkout

.github/workflows/lint.yml

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,9 @@ name: linter
22

33
on:
44
push:
5-
branches:
6-
- develop
7-
- main
5+
branches: ["*"]
86
pull_request:
9-
branches:
10-
- develop
11-
- main
7+
branches: ["*"]
128

139
permissions:
1410
contents: write
@@ -22,24 +18,26 @@ jobs:
2218
- name: Setup PHP
2319
uses: shivammathur/setup-php@v2
2420
with:
25-
php-version: '8.4'
21+
php-version: '8.3'
22+
extensions: mbstring, xml, ctype, iconv, intl, pdo_sqlite, dom, filter, gd, iconv, json, mbstring, pdo
23+
24+
- name: Setup Node.js
25+
uses: actions/setup-node@v4
26+
with:
27+
node-version: '22'
2628

2729
- name: Install Dependencies
2830
run: |
2931
composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
30-
npm install
3132
32-
- name: Run Pint
33-
run: vendor/bin/pint
33+
- name: Install pnpm
34+
run: npm install -g pnpm
3435

35-
- name: Format Frontend
36-
run: npm run format
36+
- name: Install Node dependencies
37+
run: pnpm i
3738

38-
- name: Lint Frontend
39-
run: npm run lint
39+
- name: Lint Backend
40+
run: vendor/bin/pint --test
4041

41-
# - name: Commit Changes
42-
# uses: stefanzweifel/git-auto-commit-action@v5
43-
# with:
44-
# commit_message: fix code style
45-
# commit_options: '--no-verify'
42+
- name: Lint Frontend
43+
run: pnpm run format:check

.github/workflows/release.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
name: Release
1+
name: release
22

33
on:
44
workflow_run:
5-
workflows: ["Test"]
5+
workflows: ["tests", "linter"]
66
types: [completed]
77
pull_request:
88
branches: ["master"]
@@ -12,9 +12,7 @@ permissions:
1212

1313
jobs:
1414
release:
15-
if: >
16-
github.event.workflow_run.conclusion == 'success' &&
17-
github.event.workflow_run.head_branch == 'master'
15+
if: github.event.pull_request.merged == true
1816
runs-on: ubuntu-latest
1917
steps:
2018
- name: Checkout

0 commit comments

Comments
 (0)