Skip to content

Commit 2e01df0

Browse files
authored
Merge pull request #778 from EstrellaXD/3.1-dev
3.1.14
2 parents 1cb15ca + 8e05b5e commit 2e01df0

File tree

2 files changed

+61
-13
lines changed

2 files changed

+61
-13
lines changed

.github/workflows/build.yml

+59-12
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,43 @@ jobs:
2828
mkdir -p config
2929
pytest
3030
31+
webui-test:
32+
runs-on: ubuntu-latest
33+
steps:
34+
- name: Checkout
35+
uses: actions/checkout@v4
36+
37+
- name: Install Node.js
38+
uses: actions/setup-node@v4
39+
with:
40+
node-version: 20
41+
42+
- uses: pnpm/action-setup@v4
43+
name: Install pnpm
44+
with:
45+
version: 9
46+
run_install: false
47+
48+
- name: Get pnpm store directory
49+
shell: bash
50+
run: |
51+
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
52+
53+
- uses: actions/cache@v4
54+
name: Setup pnpm cache
55+
with:
56+
path: ${{ env.STORE_PATH }}
57+
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
58+
restore-keys: |
59+
${{ runner.os }}-pnpm-store-
60+
61+
- name: Install dependencies
62+
run: cd webui && pnpm install
63+
64+
- name: build test
65+
run: |
66+
cd webui && pnpm vue-tsc --noEmit
67+
3168
version-info:
3269
runs-on: ubuntu-latest
3370
steps:
@@ -81,23 +118,33 @@ jobs:
81118
runs-on: ubuntu-latest
82119
needs: [ test, version-info ]
83120
if: ${{ needs.version-info.outputs.release == 1 || needs.version-info.outputs.dev == 1 }}
84-
strategy:
85-
matrix:
86-
node-version: [ 18 ]
87121
steps:
88122
- name: Checkout
89123
uses: actions/checkout@v4
90124

91-
- uses: pnpm/action-setup@v2
125+
- name: Install Node.js
126+
uses: actions/setup-node@v4
92127
with:
93-
version: 8
128+
node-version: 20
94129

95-
- name: Use Node.js ${{ matrix.node-version }}
96-
uses: actions/setup-node@v3
130+
- uses: pnpm/action-setup@v4
131+
name: Install pnpm
97132
with:
98-
node-version: ${{ matrix.node-version }}
99-
cache: 'pnpm'
100-
cache-dependency-path: webui/pnpm-lock.yaml
133+
version: 9
134+
run_install: false
135+
136+
- name: Get pnpm store directory
137+
shell: bash
138+
run: |
139+
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
140+
141+
- uses: actions/cache@v4
142+
name: Setup pnpm cache
143+
with:
144+
path: ${{ env.STORE_PATH }}
145+
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
146+
restore-keys: |
147+
${{ runner.os }}-pnpm-store-
101148
102149
- name: Install dependencies
103150
run: cd webui && pnpm install
@@ -247,7 +294,7 @@ jobs:
247294
run: |
248295
echo ${{ needs.version-info.outputs.version }}
249296
echo "VERSION='${{ needs.version-info.outputs.version }}'" >> module/__version__.py
250-
297+
251298
- name: Copy requirements.txt
252299
working-directory: ./backend
253300
run:
@@ -267,7 +314,7 @@ jobs:
267314
echo "version=🌟${{ needs.version-info.outputs.version }}" >> $GITHUB_OUTPUT
268315
echo "pre_release=false" >> $GITHUB_OUTPUT
269316
fi
270-
317+
271318
- name: Release
272319
id: release
273320
uses: softprops/action-gh-release@v1

webui/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -65,5 +65,6 @@
6565
"vite-plugin-pwa": "^0.16.4",
6666
"vitest": "^0.30.1",
6767
"vue-tsc": "^1.6.4"
68-
}
68+
},
69+
"packageManager": "pnpm@9.1.4+sha512.9df9cf27c91715646c7d675d1c9c8e41f6fce88246f1318c1aa6a1ed1aeb3c4f032fcdf4ba63cc69c4fe6d634279176b5358727d8f2cc1e65b65f43ce2f8bfb0"
6970
}

0 commit comments

Comments
 (0)