Skip to content

Commit 9a4fb9e

Browse files
authored
move pnpm overrides (#1092)
* migrated without linting errors Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * add to paths Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * run nightly, use ubuntu-latest Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * use --no-frozen-lockfile, to accommodate different versions Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * revert running nightly for this PR Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * add steps to set up npx for the tests Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * add comment on overrides, do not use no-frozen-lockfile Signed-off-by: Aaron Chong <aaronchongth@gmail.com> --------- Signed-off-by: Aaron Chong <aaronchongth@gmail.com>
1 parent 0ee3494 commit 9a4fb9e

9 files changed

Lines changed: 242 additions & 135 deletions

.github/workflows/api-client.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ on:
66
- '.github/actions/bootstrap/action.yml'
77
- '.github/minimal-rmf/**'
88
- 'packages/api-client/**'
9+
- 'package.json'
10+
- 'pnpm-workspace.yaml'
911
push:
1012
branches:
1113
- main

.github/workflows/api-server.yml.disabled

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ on:
66
- '.github/actions/bootstrap/action.yml'
77
- '.github/minimal-rmf/**'
88
- 'packages/api-server/**'
9+
- 'package.json'
10+
- 'pnpm-workspace.yaml'
911
push:
1012
branches:
1113
- main
@@ -18,7 +20,7 @@ env:
1820
jobs:
1921
tests:
2022
name: Tests
21-
runs-on: ubuntu-24.04
23+
runs-on: ubuntu-latest
2224
container:
2325
image: ghcr.io/${{ github.repository }}/minimal-rmf:rolling-nightly
2426
credentials:

.github/workflows/dashboard-e2e.yml.disabled

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ env:
99
jobs:
1010
dashboard-e2e:
1111
name: Dashboard e2e
12-
runs-on: ubuntu-24.04
12+
runs-on: ubuntu-latest
1313
container:
1414
image: ghcr.io/${{ github.repository }}/e2e
1515
credentials:

.github/workflows/nightly.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ concurrency:
99
jobs:
1010
build-minimal-rmf-docker-images:
1111
name: Push minimal-rmf Docker image to GitHub Packages
12-
runs-on: ubuntu-24.04
12+
runs-on: ubuntu-latest
1313
strategy:
1414
fail-fast: false
1515
matrix:
@@ -35,7 +35,7 @@ jobs:
3535
build-dashboard-image:
3636
needs: build-minimal-rmf-docker-images
3737
name: Push Dashboard docker image to GitHub Packages
38-
runs-on: ubuntu-24.04
38+
runs-on: ubuntu-latest
3939
strategy:
4040
fail-fast: false
4141
matrix:
@@ -62,7 +62,7 @@ jobs:
6262
build-api-server-image:
6363
needs: build-minimal-rmf-docker-images
6464
name: Push API server docker image to GitHub Packages
65-
runs-on: ubuntu-24.04
65+
runs-on: ubuntu-latest
6666
strategy:
6767
fail-fast: false
6868
matrix:
@@ -125,7 +125,7 @@ jobs:
125125
api-server:
126126
needs: build-minimal-rmf-docker-images
127127
name: Test API server
128-
runs-on: ubuntu-24.04
128+
runs-on: ubuntu-latest
129129
strategy:
130130
fail-fast: false
131131
matrix:
@@ -163,7 +163,7 @@ jobs:
163163
rmf-dashboard-framework:
164164
needs: build-minimal-rmf-docker-images
165165
name: Test dashboard framework
166-
runs-on: ubuntu-24.04
166+
runs-on: ubuntu-latest
167167
strategy:
168168
fail-fast: false
169169
matrix:
@@ -198,7 +198,7 @@ jobs:
198198
ros-translator:
199199
needs: build-minimal-rmf-docker-images
200200
name: Test ros-translator
201-
runs-on: ubuntu-24.04
201+
runs-on: ubuntu-latest
202202
strategy:
203203
fail-fast: false
204204
matrix:
@@ -237,7 +237,7 @@ jobs:
237237
# fail-fast: false
238238
# needs: build-docker-images
239239
# name: Dashboard e2e
240-
# runs-on: ubuntu-24.04
240+
# runs-on: ubuntu-latest
241241
# container:
242242
# image: ghcr.io/${{ github.repository }}/e2e
243243
# options: --privileged --ipc=host

.github/workflows/rmf-dashboard-framework.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ on:
88
- 'packages/rmf-dashboard-framework/**'
99
- 'packages/rmf-models/**'
1010
- 'packages/api-client/**'
11+
- 'package.json'
12+
- 'pnpm-workspace.yaml'
1113
push:
1214
branches:
1315
- main
@@ -19,7 +21,7 @@ env:
1921
jobs:
2022
unit-tests:
2123
name: Unit Tests
22-
runs-on: ubuntu-24.04
24+
runs-on: ubuntu-latest
2325
container:
2426
image: ghcr.io/${{ github.repository }}/minimal-rmf:rolling-nightly
2527
credentials:

.github/workflows/ros-translator.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ on:
66
- '.github/actions/bootstrap/action.yml'
77
- '.github/minimal-rmf/**'
88
- 'packages/ros-translator/**'
9+
- 'package.json'
10+
- 'pnpm-workspace.yaml'
911
push:
1012
branches:
1113
- main
@@ -17,7 +19,7 @@ env:
1719
jobs:
1820
unit-tests:
1921
name: Unit Tests
20-
runs-on: ubuntu-24.04
22+
runs-on: ubuntu-latest
2123
container:
2224
image: ghcr.io/${{ github.repository }}/minimal-rmf:rolling-nightly
2325
credentials:
@@ -36,5 +38,8 @@ jobs:
3638
with:
3739
package: ros-translator
3840
skip-build: true
41+
- name: set up npx
42+
run: |
43+
pnpm add -g npm
3944
- name: test
4045
run: . /opt/ros/rolling/setup.bash && pnpm test

package.json

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -32,31 +32,5 @@
3232
".venv/bin/pipenv run isort",
3333
".venv/bin/pipenv run black"
3434
]
35-
},
36-
"pnpm": {
37-
"overrides": {
38-
"typescript-json-schema>@types/node": "*",
39-
"form-data@<4.0.4": "^4.0.4",
40-
"axios@<1.12.0": "^1.16.0",
41-
"qs": "^6.14.2",
42-
"min-document": "^2.19.1",
43-
"follow-redirects": "^1.16.0",
44-
"lodash": "^4.18.0",
45-
"yaml": "^1.10.3",
46-
"serialize-javascript": "^7.0.5",
47-
"react-router": "^6.30.2",
48-
"@babel/runtime": "^7.26.10",
49-
"file-type": "^21.3.1",
50-
"@remix-run/router": "^1.23.2",
51-
"rollup": "^4.59.0",
52-
"phin": "^3.7.1",
53-
"node-fetch": "^2.6.7",
54-
"ws": "^7.5.10",
55-
"cross-spawn": "^7.0.5",
56-
"tar-fs": "^2.1.4"
57-
}
58-
},
59-
"overrides": {
60-
"react-error-overlay": "6.0.9"
6135
}
6236
}

0 commit comments

Comments
 (0)