Skip to content

Commit 7201b77

Browse files
authored
Get rid of cross-rs (#2700)
1 parent f36cdc6 commit 7201b77

7 files changed

Lines changed: 279 additions & 262 deletions

File tree

.github/workflows/lint-e2e.yml

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,28 @@ on:
1616

1717
jobs:
1818
lint-e2e:
19-
runs-on: [self-hosted, Linux, X64]
19+
runs-on:
20+
- codebuild-defguard-core-runner-${{ github.run_id }}-${{ github.run_attempt }}
2021
steps:
21-
- uses: actions/checkout@v6
22-
- uses: actions/setup-node@v6
22+
- name: Checkout
23+
uses: actions/checkout@v6
2324
with:
24-
node-version-file: "./e2e/.nvmrc"
25-
- uses: pnpm/action-setup@v4
25+
submodules: recursive
26+
27+
- name: Install NodeJS
28+
uses: actions/setup-node@v6
29+
with:
30+
node-version: 25
31+
32+
- name: Install pnpm
33+
uses: pnpm/action-setup@v6
2634
with:
27-
# FIXME: temporarily pinned because of https://github.com/pnpm/pnpm/pull/9959
28-
version: 10.17
29-
run_install: false
30-
- name: install deps
31-
working-directory: ./e2e
32-
run: pnpm i --frozen-lockfile
33-
- name: Lint
34-
working-directory: ./e2e
35-
run: pnpm lint
35+
version: 10
36+
37+
# Change to '--frozen-lockfile' once this gets fixed:
38+
# https://github.com/pnpm/action-setup/issues/40
39+
- name: Build and lint e2e
40+
working-directory: e2e
41+
run: |
42+
pnpm install --no-frozen-lockfile
43+
pnpm lint

.github/workflows/lint-web.yml

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,25 +20,28 @@ jobs:
2020
lint-web:
2121
runs-on:
2222
- codebuild-defguard-core-runner-${{ github.run_id }}-${{ github.run_attempt }}
23-
2423
steps:
25-
- uses: actions/checkout@v6
24+
- name: Checkout
25+
uses: actions/checkout@v6
2626
with:
27-
submodules: "recursive"
28-
- uses: actions/setup-node@v6
27+
submodules: recursive
28+
29+
- name: Install NodeJS
30+
uses: actions/setup-node@v6
2931
with:
3032
node-version: 25
31-
- name: install deps
32-
working-directory: ./web
33+
34+
- name: Install pnpm
35+
uses: pnpm/action-setup@v6
36+
with:
37+
version: 10
38+
39+
# Change to '--frozen-lockfile' once this gets fixed:
40+
# https://github.com/pnpm/action-setup/issues/40
41+
- name: Lint frontend
42+
working-directory: web
3343
run: |
34-
npm i -g npm pnpm
35-
pnpm i --frozen-lockfile
36-
- name: Build
37-
working-directory: ./web
38-
run: pnpm run build
39-
- name: Lint
40-
working-directory: ./web
41-
run: pnpm run lint
42-
- name: Audit
43-
working-directory: ./web
44-
run: pnpm audit --prod --ignore-unfixable
44+
pnpm install --ignore-scripts --no-frozen-lockfile
45+
pnpm build
46+
pnpm lint
47+
pnpm audit --prod --ignore-unfixable

0 commit comments

Comments
 (0)