Skip to content

Commit 53cf513

Browse files
chore(ci): update workflows
_This PR is created by sync and will be force-pushed daily. Overwriting any manual changes done to this PR._ - Updated branch checks - Updated PR checks
1 parent 4fa18be commit 53cf513

File tree

2 files changed

+31
-30
lines changed

2 files changed

+31
-30
lines changed

.github/workflows/branch-checks.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ jobs:
2020
uses: actions/setup-node@v3
2121
with:
2222
node-version: 18
23-
cache: "yarn"
23+
cache: "npm"
2424

2525
- name: Run format
2626
run: |
27-
yarn
28-
yarn format
27+
npm install
28+
npm run format
2929
3030
test:
3131
timeout-minutes: 15
@@ -39,12 +39,12 @@ jobs:
3939
uses: actions/setup-node@v3
4040
with:
4141
node-version: 18
42-
cache: "yarn"
42+
cache: "npm"
4343

4444
- name: Run test
4545
run: |
46-
yarn
47-
yarn test --passWithNoTests
46+
npm install
47+
npm run test --passWithNoTests
4848
4949
build:
5050
timeout-minutes: 15
@@ -58,9 +58,9 @@ jobs:
5858
uses: actions/setup-node@v3
5959
with:
6060
node-version: 18
61-
cache: "yarn"
61+
cache: "npm"
6262

6363
- name: Run build
6464
run: |
65-
yarn
66-
yarn build
65+
npm install
66+
npm run build

.github/workflows/pr-checks.yml

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ jobs:
1717
uses: actions/setup-node@v3
1818
with:
1919
node-version: 18
20-
cache: "yarn"
20+
cache: "npm"
2121

2222
- name: Run format
2323
run: |
24-
yarn install
25-
yarn format
24+
npm install
25+
npm run format
2626
2727
test:
2828
timeout-minutes: 15
@@ -36,12 +36,12 @@ jobs:
3636
uses: actions/setup-node@v3
3737
with:
3838
node-version: 18
39-
cache: "yarn"
39+
cache: "npm"
4040

4141
- name: Run test
4242
run: |
43-
yarn install
44-
yarn test --passWithNoTests
43+
npm install
44+
npm run test --passWithNoTests
4545
4646
build:
4747
timeout-minutes: 15
@@ -55,20 +55,21 @@ jobs:
5555
uses: actions/setup-node@v3
5656
with:
5757
node-version: 18
58-
cache: "yarn"
58+
cache: "npm"
5959

6060
- uses: actions/cache@v3
6161
with:
6262
path: |
6363
${{ github.workspace }}/.next/cache
64-
key: next-build-cache-${{ hashFiles('./yarn.lock') }}-${{ hashFiles('**.[jt]s', '**.[jt]sx') }}
64+
key:
65+
next-build-cache-${{ hashFiles('./package-lock.json') }}-${{ hashFiles('**.[jt]s', '**.[jt]sx') }}
6566
restore-keys: |
66-
next-build-cache-${{ hashFiles('./yarn.lock') }}-
67+
next-build-cache-${{ hashFiles('./package-lock.json') }}-
6768
6869
- name: Run build
6970
run: |
70-
yarn
71-
yarn build
71+
npm install
72+
npm run build
7273
7374
e2e:
7475
timeout-minutes: 15
@@ -90,35 +91,35 @@ jobs:
9091
uses: actions/setup-node@v3
9192
with:
9293
node-version: 18
93-
cache: "yarn"
94-
cache-dependency-path: "**/yarn.lock"
94+
cache: "npm"
95+
cache-dependency-path: "**/package-lock.json"
9596

9697
- uses: actions/cache@v3
9798
with:
9899
path: |
99100
${{ github.workspace }}/frontend/.next/cache
100101
key:
101-
next-build-cache-${{ hashFiles('./frontend/yarn.lock') }}-${{ hashFiles('./frontend/**.[jt]s',
102-
'./frontend/**.[jt]sx') }}
102+
next-build-cache-${{ hashFiles('./frontend/package-lock.json') }}-${{
103+
hashFiles('./frontend/**.[jt]s', './frontend/**.[jt]sx') }}
103104
restore-keys: |
104-
next-build-cache-${{ hashFiles('./frontend/yarn.lock') }}-
105+
next-build-cache-${{ hashFiles('./frontend/package-lock.json') }}-
105106
106107
- name: Install
107108
run: |
108109
cd ./backend
109-
yarn
110-
yarn compas generate application --skip-lint
110+
npm install
111+
npx compas generate application --skip-lint
111112
cd ../frontend
112-
yarn
113-
yarn playwright install --with-deps chromium
113+
npm install
114+
npx playwright install --with-deps chromium
114115
115116
- name: Run e2e
116117
env:
117118
TENANT_ORIGIN: "scaffold.acc.lightbase.nl"
118119
TENANT_API_URL: "http://localhost:3001"
119120
run: |
120121
cd ./frontend
121-
yarn test:e2e:ci
122+
npm run test:e2e:ci
122123
123124
- name: Upload test results
124125
if: always()

0 commit comments

Comments
 (0)