Skip to content

Commit 90eefff

Browse files
Copiloticlanton
andcommitted
Fix CI pipeline steps and move @microsoft/rush to nonbrowser-approved-packages.json
Co-authored-by: iclanton <5010588+iclanton@users.noreply.github.com>
1 parent ed936b6 commit 90eefff

4 files changed

Lines changed: 8 additions & 13 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,8 @@ jobs:
8080
working-directory: repo-a
8181

8282
- name: Run package manager integration tests
83-
run: |
84-
node ${{ github.workspace }}/repo-a/apps/rush/lib/start-dev.js build --to rush-package-manager-integration-test
85-
cd build-tests/rush-package-manager-integration-test
86-
npm run test
87-
working-directory: repo-a
83+
run: npm run test
84+
working-directory: repo-a/build-tests/rush-package-manager-integration-test
8885

8986
- name: Ensure repo README is up-to-date
9087
run: node repo-scripts/repo-toolbox/lib/start.js readme --verify

common/config/azure-pipelines/templates/build.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ steps:
2525
- script: 'node common/scripts/install-run-rush.js retest --verbose --production ${{ parameters.BuildParameters }}'
2626
displayName: 'Rush retest (install-run-rush)'
2727

28-
- script: |
29-
node apps/rush/lib/start-dev.js build --to rush-package-manager-integration-test
30-
cd build-tests/rush-package-manager-integration-test
31-
npm run test
28+
- script: 'npm run test'
29+
workingDirectory: 'build-tests/rush-package-manager-integration-test'
3230
displayName: 'Run package manager integration tests'

common/config/rush/browser-approved-packages.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414
"name": "@lifaon/path",
1515
"allowedCategories": [ "libraries" ]
1616
},
17-
{
18-
"name": "@microsoft/rush",
19-
"allowedCategories": [ "tests" ]
20-
},
2117
{
2218
"name": "@radix-ui/colors",
2319
"allowedCategories": [ "libraries" ]

common/config/rush/nonbrowser-approved-packages.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,10 @@
6262
"name": "@microsoft/load-themed-styles",
6363
"allowedCategories": [ "libraries" ]
6464
},
65+
{
66+
"name": "@microsoft/rush",
67+
"allowedCategories": [ "tests" ]
68+
},
6569
{
6670
"name": "@microsoft/rush-lib",
6771
"allowedCategories": [ "libraries", "tests", "vscode-extensions" ]

0 commit comments

Comments
 (0)