Skip to content

Commit 33f232a

Browse files
authored
Merge pull request RooCodeInc#1548 from RooVetGit/cte/npm-install-all
Simplify `npm install` by automatically installing npm-run-all
2 parents ebb5a57 + 2187369 commit 33f232a

File tree

4 files changed

+14
-16
lines changed

4 files changed

+14
-16
lines changed

.github/workflows/changeset-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
cache: 'npm'
3838

3939
- name: Install Dependencies
40-
run: npm run install:ci
40+
run: npm run install:all
4141

4242
# Check if there are any new changesets to process
4343
- name: Check for changesets

.github/workflows/code-qa.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
node-version: '18'
2121
cache: 'npm'
2222
- name: Install dependencies
23-
run: npm run install:ci
23+
run: npm run install:all
2424
- name: Compile
2525
run: npm run compile
2626
- name: Check types
@@ -39,7 +39,7 @@ jobs:
3939
node-version: '18'
4040
cache: 'npm'
4141
- name: Install dependencies
42-
run: npm run install:ci
42+
run: npm run install:all
4343
- name: Run knip checks
4444
run: npm run knip
4545

@@ -54,7 +54,7 @@ jobs:
5454
node-version: '18'
5555
cache: 'npm'
5656
- name: Install dependencies
57-
run: npm run install:ci
57+
run: npm run install:all
5858
- name: Run unit tests
5959
run: npx jest --silent
6060

@@ -69,7 +69,7 @@ jobs:
6969
node-version: '18'
7070
cache: 'npm'
7171
- name: Install dependencies
72-
run: npm run install:ci
72+
run: npm run install:all
7373
- name: Run unit tests
7474
working-directory: webview-ui
7575
run: npx jest --silent
@@ -109,7 +109,7 @@ jobs:
109109
node-version: '18'
110110
cache: 'npm'
111111
- name: Install dependencies
112-
run: npm run install:ci
112+
run: npm run install:all
113113
- name: Create env.integration file
114114
working-directory: e2e
115115
run: echo "OPENROUTER_API_KEY=${{ secrets.OPENROUTER_API_KEY }}" > .env.integration

.github/workflows/marketplace-publish.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
publish-extension:
1212
runs-on: ubuntu-latest
1313
permissions:
14-
contents: write # Required for pushing tags
14+
contents: write # Required for pushing tags.
1515
if: >
1616
( github.event_name == 'pull_request' &&
1717
github.event.pull_request.base.ref == 'main' &&
@@ -33,13 +33,9 @@ jobs:
3333
- name: Install Dependencies
3434
run: |
3535
npm install -g vsce ovsx
36-
npm run install:ci
37-
36+
npm run install:all
3837
- name: Create .env file
39-
run: |
40-
echo "# PostHog API Keys for telemetry" > .env
41-
echo "POSTHOG_API_KEY=${{ secrets.POSTHOG_API_KEY }}" >> .env
42-
38+
run: echo "POSTHOG_API_KEY=${{ secrets.POSTHOG_API_KEY }}" >> .env
4339
- name: Package Extension
4440
run: |
4541
current_package_version=$(node -p "require('./package.json').version")

package.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,8 @@
230230
"build": "npm run build:webview && npm run vsix",
231231
"build:webview": "cd webview-ui && npm run build",
232232
"compile": "tsc -p . --outDir out && node esbuild.js",
233-
"install:all": "npm-run-all -p install-*",
234-
"install:ci": "npm install npm-run-all && npm run install:all",
233+
"install:all": "npm install npm-run-all && npm run install:_all",
234+
"install:_all": "npm-run-all -p install-*",
235235
"install-extension": "npm install",
236236
"install-webview-ui": "cd webview-ui && npm install",
237237
"install-e2e": "cd e2e && npm install",
@@ -246,7 +246,9 @@
246246
"package": "npm run build:webview && npm run check-types && npm run lint && node esbuild.js --production",
247247
"pretest": "npm run compile",
248248
"dev": "cd webview-ui && npm run dev",
249-
"test": "jest && cd webview-ui && npm run test",
249+
"test": "npm-run-all -p test:*",
250+
"test:extension": "jest",
251+
"test:webview": "cd webview-ui && npm run test",
250252
"prepare": "husky",
251253
"publish:marketplace": "vsce publish && ovsx publish",
252254
"publish": "npm run build && changeset publish && npm install --package-lock-only",

0 commit comments

Comments
 (0)