Skip to content

Commit eaee797

Browse files
committed
Revert: Restore original npm-based workflow that was working
1 parent c99d355 commit eaee797

2 files changed

Lines changed: 28 additions & 79 deletions

File tree

‎.github/workflows/ci-cd.yml‎

Lines changed: 26 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,10 @@ on:
1111
- cron: '0 2 * * *'
1212

1313
env:
14-
CARGO_TERM_COLOR: always
15-
RUST_BACKTRACE: 1
16-
NODE_VERSION: '18'
17-
RUST_VERSION: '1.75'
18-
PNPM_VERSION: '10.24.0'
14+
CARGO_TERM_COLOR: always
15+
RUST_BACKTRACE: 1
16+
NODE_VERSION: '18'
17+
RUST_VERSION: '1.75'
1918

2019
jobs:
2120
# Code quality and linting
@@ -26,15 +25,11 @@ jobs:
2625
- name: Checkout code
2726
uses: actions/checkout@v4
2827

29-
- name: Setup pnpm
30-
uses: pnpm/action-setup@v4
31-
with:
32-
version: 10.24.0
33-
3428
- name: Setup Node.js
3529
uses: actions/setup-node@v4
3630
with:
3731
node-version: ${{ env.NODE_VERSION }}
32+
cache: 'npm'
3833

3934
- name: Setup Rust
4035
uses: dtolnay/rust-toolchain@stable
@@ -48,10 +43,10 @@ jobs:
4843
workspaces: src-rust
4944

5045
- name: Install frontend dependencies
51-
run: pnpm install
46+
run: npm ci
5247

5348
- name: Lint frontend
54-
run: pnpm run lint
49+
run: npm run lint
5550

5651
- name: Check Rust formatting
5752
run: cd src-rust && cargo fmt -- --check
@@ -61,7 +56,7 @@ jobs:
6156

6257
- name: Check for security vulnerabilities
6358
run: |
64-
pnpm audit --audit-level high
59+
npm audit --audit-level high
6560
cd src-rust && cargo audit || echo "cargo-audit not installed"
6661
6762
# Backend testing
@@ -115,32 +110,20 @@ jobs:
115110
- name: Checkout code
116111
uses: actions/checkout@v4
117112

118-
- name: Setup pnpm
119-
uses: pnpm/action-setup@v4
120-
with:
121-
version: 10.24.0
122-
123113
- name: Setup Node.js
124114
uses: actions/setup-node@v4
125115
with:
126116
node-version: ${{ env.NODE_VERSION }}
127-
128-
- name: Setup pnpm cache
129-
uses: actions/cache@v4
130-
with:
131-
path: ~/.pnpm-store
132-
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/package.json') }}
133-
restore-keys: |
134-
${{ runner.os }}-pnpm-store-
117+
cache: 'npm'
135118

136119
- name: Install dependencies
137-
run: pnpm install
120+
run: npm ci
138121

139122
- name: Run unit tests
140-
run: pnpm run test:run
123+
run: npm run test:run
141124

142125
- name: Run tests with coverage
143-
run: pnpm run test:coverage
126+
run: npm run test:coverage
144127

145128
- name: Upload coverage to Codecov
146129
uses: codecov/codecov-action@v3
@@ -157,15 +140,11 @@ jobs:
157140
- name: Checkout code
158141
uses: actions/checkout@v4
159142

160-
- name: Setup pnpm
161-
uses: pnpm/action-setup@v4
162-
with:
163-
version: 10.24.0
164-
165143
- name: Setup Node.js
166144
uses: actions/setup-node@v4
167145
with:
168146
node-version: ${{ env.NODE_VERSION }}
147+
cache: 'npm'
169148

170149
- name: Setup Rust
171150
uses: dtolnay/rust-toolchain@stable
@@ -178,13 +157,13 @@ jobs:
178157
workspaces: src-rust
179158

180159
- name: Install dependencies
181-
run: pnpm install
160+
run: npm ci
182161

183162
- name: Install Playwright browsers
184-
run: pnpm exec playwright install --with-deps
163+
run: npx playwright install --with-deps
185164

186165
- name: Build frontend
187-
run: pnpm run build
166+
run: npm run build
188167

189168
- name: Build backend
190169
run: |
@@ -207,7 +186,7 @@ jobs:
207186
RUST_LOG: info
208187

209188
- name: Run E2E tests
210-
run: pnpm run test:e2e
189+
run: npm run test:e2e
211190

212191
- name: Upload E2E test results
213192
uses: actions/upload-artifact@v4
@@ -238,29 +217,16 @@ jobs:
238217
with:
239218
sarif_file: 'trivy-results.sarif'
240219

241-
- name: Setup pnpm
242-
uses: pnpm/action-setup@v4
243-
with:
244-
version: 10.24.0
245-
246-
- name: Setup Node.js for pnpm audit
220+
- name: Setup Node.js for npm audit
247221
uses: actions/setup-node@v4
248222
with:
249223
node-version: ${{ env.NODE_VERSION }}
250224

251-
- name: Setup pnpm cache
252-
uses: actions/cache@v4
253-
with:
254-
path: ~/.pnpm-store
255-
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/package.json') }}
256-
restore-keys: |
257-
${{ runner.os }}-pnpm-store-
258-
259225
- name: Install dependencies
260-
run: pnpm install
226+
run: npm ci
261227

262-
- name: Run pnpm audit
263-
run: pnpm audit --audit-level high
228+
- name: Run npm audit
229+
run: npm audit --audit-level high
264230

265231
# Build and package
266232
build:
@@ -277,15 +243,11 @@ jobs:
277243
- name: Checkout code
278244
uses: actions/checkout@v4
279245

280-
- name: Setup pnpm
281-
uses: pnpm/action-setup@v4
282-
with:
283-
version: 10.24.0
284-
285246
- name: Setup Node.js
286247
uses: actions/setup-node@v4
287248
with:
288249
node-version: ${{ env.NODE_VERSION }}
250+
cache: 'npm'
289251

290252
- name: Setup Rust
291253
uses: dtolnay/rust-toolchain@stable
@@ -305,10 +267,10 @@ jobs:
305267
sudo apt-get install -y mingw-w64
306268
307269
- name: Install dependencies
308-
run: pnpm install
270+
run: npm ci
309271

310272
- name: Build frontend
311-
run: pnpm run build
273+
run: npm run build
312274

313275
- name: Build backend
314276
run: |
@@ -462,30 +424,17 @@ jobs:
462424
- name: Checkout code
463425
uses: actions/checkout@v4
464426

465-
- name: Setup pnpm
466-
uses: pnpm/action-setup@v4
467-
with:
468-
version: 10.24.0
469-
470427
- name: Setup Node.js
471428
uses: actions/setup-node@v4
472429
with:
473430
node-version: ${{ env.NODE_VERSION }}
474431

475-
- name: Setup pnpm cache
476-
uses: actions/cache@v4
477-
with:
478-
path: ~/.pnpm-store
479-
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/package.json') }}
480-
restore-keys: |
481-
${{ runner.os }}-pnpm-store-
482-
483432
- name: Install dependencies
484-
run: pnpm install
433+
run: npm ci
485434

486435
- name: Run Lighthouse CI
487436
run: |
488-
pnpm add -g @lhci/cli@0.12.x
437+
npm install -g @lhci/cli@0.12.x
489438
lhci autorun
490439
env:
491440
LHCI_GITHUB_APP_TOKEN: ${{ secrets.LHCI_GITHUB_APP_TOKEN }}

‎vercel.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "https://openapi.vercel.sh/vercel.json",
3-
"buildCommand": "pnpm run build",
4-
"installCommand": "pnpm install",
3+
"buildCommand": "npm run build",
4+
"installCommand": "npm install",
55
"rewrites": [
66
{
77
"source": "/(.*)",

0 commit comments

Comments
 (0)