Skip to content

Commit

Permalink
ci(repo): Updates to CI install
Browse files Browse the repository at this point in the history
  • Loading branch information
sullivanpj committed Jun 26, 2023
1 parent a8c26b7 commit 937b163
Show file tree
Hide file tree
Showing 6 changed files with 49 additions and 49 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
cache: 'npm'

- uses: nrwl/nx-set-shas@v3
- run: npm install --no-frozen-lockfile --legacy-peer-deps
- run: npm install --legacy-peer-deps

- run: npm run build:tools-ci
- run: npx nx format
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:

- name: Install Dependencies
uses: nrwl/nx-set-shas@v3
- run: npm install --no-frozen-lockfile --legacy-peer-deps
- run: npm install --legacy-peer-deps

- name: Prepare for build
run: npm run build:tools-ci
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nextjs-bundle-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
node-version: "18.x"

- name: Install dependencies
run: npm install --frozen-lockfile --legacy-peer-deps
run: npm install --legacy-peer-deps

- name: Restore next build
uses: actions/cache@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
cache: 'npm'

- name: Install dependencies
run: npm install --no-frozen-lockfile --legacy-peer-deps
run: npm install --legacy-peer-deps

- name: Get appropriate base and head commits for `nx affected` commands
uses: nrwl/nx-set-shas@v3
Expand Down
46 changes: 23 additions & 23 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 22 additions & 22 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"docs/*"
],
"scripts": {
"nx": "cross-env FORCE_COLOR=1 nx",
"nx": "nx",
"prepare:restore": "is-ci || nx g @nx-dotnet/core:restore",
"prepare:husky": "is-ci || husky install",
"prepare": "npm run prepare:restore && npm run prepare:husky && npx patch-package -y",
Expand All @@ -39,33 +39,33 @@
"clean:tools": "rimraf dist/tools",
"clean": "rimraf dist",
"restore": "nx g @nx-dotnet/core:restore",
"build:tools-executors-typescript": "npx nx run tools-executors-typescript:build:client-api-sync && npx nx run tools-executors-typescript:build:design-tokens-clean && npx nx run tools-executors-typescript:build:design-tokens-build",
"build:tools-generators-typescript": "npx nx run tools-generators-typescript:build:client-api",
"build:tools-executors-dotnet": "npx nx run tools-executors-dotnet:build:async-api-sync && npx nx run tools-executors-dotnet:build:server-api-sync && npx nx run tools-executors-dotnet:build:build",
"build:tools-generators-dotnet": "npx nx run tools-generators-dotnet:build:async-api && npx nx run tools-generators-dotnet:build:server-api && npx nx run tools-generators-dotnet:build:restore",
"build:tools-executors-docs": "npx nx run tools-executors-docs:build:design-tokens-docgen",
"build:tools-typescript": "npm run build:tools-executors-typescript && npm run build:tools-generators-typescript",
"build:tools-dotnet": "npm run build:tools-executors-dotnet && npm run build:tools-generators-dotnet",
"build:tools": "npm run build:tools-typescript && npm run build:tools-dotnet && npm run build:tools-executors-docs",
"build:tools-ci": "npx nx run tools-executors-typescript:build:design-tokens-build && npx nx run design-system-tokens:build:open-system",
"build:web-deploy": "npm run build:tools-ci && npx nx run web-shell:build:production",
"build:storybook": "storybook build -s public",
"build:tools-executors-typescript": "cross-env FORCE_COLOR=1 npx nx run tools-executors-typescript:build:client-api-sync && npx nx run tools-executors-typescript:build:design-tokens-clean && npx nx run tools-executors-typescript:build:design-tokens-build",
"build:tools-generators-typescript": "cross-env FORCE_COLOR=1 npx nx run tools-generators-typescript:build:client-api",
"build:tools-executors-dotnet": "cross-env FORCE_COLOR=1 npx nx run tools-executors-dotnet:build:async-api-sync && npx nx run tools-executors-dotnet:build:server-api-sync && npx nx run tools-executors-dotnet:build:build",
"build:tools-generators-dotnet": "cross-env FORCE_COLOR=1 npx nx run tools-generators-dotnet:build:async-api && npx nx run tools-generators-dotnet:build:server-api && npx nx run tools-generators-dotnet:build:restore",
"build:tools-executors-docs": "cross-env FORCE_COLOR=1 npx nx run tools-executors-docs:build:design-tokens-docgen",
"build:tools-typescript": "cross-env FORCE_COLOR=1 npm run build:tools-executors-typescript && npm run build:tools-generators-typescript",
"build:tools-dotnet": "cross-env FORCE_COLOR=1 npm run build:tools-executors-dotnet && npm run build:tools-generators-dotnet",
"build:tools": "cross-env FORCE_COLOR=1 npm run build:tools-typescript && npm run build:tools-dotnet && npm run build:tools-executors-docs",
"build:tools-ci": "cross-env FORCE_COLOR=1 npx nx run tools-executors-typescript:build:design-tokens-build && npx nx run design-system-tokens:build:open-system",
"build:web-deploy": "cross-env FORCE_COLOR=1 npm run build:tools-ci && npx nx run web-shell:build:production",
"build:storybook": "cross-env FORCE_COLOR=1 storybook build -s public",
"build": "cross-env FORCE_COLOR=1 nx run-many -t build --all --parallel 4",
"lint:spellcheck": "cspell --no-progress --relative --dot --gitignore",
"lint:language": "alex .",
"lint:js": "eslint --cache --report-unused-disable-directives \"**/*.{js,jsx,ts,tsx}\"",
"lint": "cross-env FORCE_COLOR=1 nx lint && npm run lint:spellcheck && npm run lint:language && npm run lint:js",
"lint:spellcheck": "cross-env FORCE_COLOR=1 cspell --no-progress --relative --dot --gitignore",
"lint:language": "cross-env FORCE_COLOR=1 alex .",
"lint:js": "cross-env FORCE_COLOR=1 eslint --cache --report-unused-disable-directives \"**/*.{js,jsx,ts,tsx}\"",
"lint": "nx lint && npm run lint:spellcheck && npm run lint:language && npm run lint:js",
"analyze": "cross-env ANALYZE=true npm run build",
"test:storybook": "test-storybook",
"test": "cross-env FORCE_COLOR=1 nx test",
"test:storybook": "cross-env FORCE_COLOR=1 test-storybook",
"test": "nx test",
"storybook": "cross-env FORCE_COLOR=1 storybook dev -p 6006",
"start": "cross-env FORCE_COLOR=1 nx serve",
"format": "cross-env FORCE_COLOR=1 nx format",
"start": "nx serve",
"format": "nx format",
"add:contributors": "all-contributors add",
"generate:contributors": "all-contributors generate",
"add:decisions": "npx log4brains adr new",
"preview:decisions": "npx log4brains preview",
"semantic-release": "cross-env FORCE_COLOR=1 semantic-release --branches main"
"semantic-release": "semantic-release --branches main"
},
"private": true,
"dependencies": {
Expand Down Expand Up @@ -113,7 +113,7 @@
"@docusaurus/module-type-aliases": "2.4.1",
"@docusaurus/preset-classic": "^2.4.1",
"@hookform/devtools": "^4.3.1",
"@mdx-js/react": "^2.0.0",
"@mdx-js/react": "^1.6.22",
"@nx-dotnet/core": "^1.22.0",
"@nx-dotnet/dotnet": "^1.22.0",
"@nx-plus/docusaurus": "^15.0.0-rc.0",
Expand Down

0 comments on commit 937b163

Please sign in to comment.