Skip to content

Commit a95acca

Browse files
authored
Merge pull request #275 from ForgeRock/fix-publish-ci
chore: fix-formatting
2 parents 6bc605b + f45c638 commit a95acca

3 files changed

Lines changed: 7 additions & 1033 deletions

File tree

.github/workflows/publish.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ env:
1010
PNPM_CACHE_FOLDER: .pnpm-store
1111
NPM_ACCESS_TOKEN: ${{ secrets.NPM_ACCESS_TOKEN }}
1212
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
13+
CI: true
1314

1415
jobs:
1516
publish-or-pr:
@@ -42,13 +43,13 @@ jobs:
4243
- run: pnpm exec playwright install
4344

4445
- uses: nrwl/nx-set-shas@v4
45-
with:
46-
main-branch-name: main
46+
47+
- run: git branch --track main origin/main
4748

4849
- name: setup pnpm config
4950
run: pnpm config set store-dir $PNPM_CACHE_FOLDER
5051

51-
- run: pnpm exec nx affected -t build lint test e2e
52+
- run: pnpm exec nx affected -t build lint test e2e-ci
5253

5354
- uses: actions/upload-artifact@v4
5455
if: ${{ !cancelled() }}

package.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"build": "nx affected --target=build",
1717
"changeset": "changeset",
1818
"ci:release": "pnpm publish -r --no-git-checks && changeset tag",
19-
"ci:version": "changeset version && pnpm install --no-frozen-lockfile && pnpm nx format:write",
19+
"ci:version": "changeset version && pnpm install --no-frozen-lockfile && pnpm nx format:write --uncommitted",
2020
"circular-dep-check": "madge --circular .",
2121
"clean": "shx rm -rf ./{coverage,dist,docs,node_modules,tmp}/ ./{packages,e2e}/*/{dist,node_modules}/ && git clean -fX -e \"!.env*,nx-cloud.env\"",
2222
"commit": "git cz",
@@ -104,7 +104,6 @@
104104
"jsonc-eslint-parser": "^2.1.0",
105105
"lint-staged": "^15.0.0",
106106
"madge": "8.0.0",
107-
"npm-cli-login": "^1.0.0",
108107
"nx": "20.5.0",
109108
"playwright": "^1.47.2",
110109
"prettier": "^3.2.5",
@@ -119,10 +118,6 @@
119118
"typescript-eslint": "^8.19.0",
120119
"verdaccio": "6.1.2",
121120
"vite": "6.2.6",
122-
"vite-plugin-dts": "4.5.3",
123-
"vite-plugin-eslint": "^1.8.1",
124-
"vite-plugin-externalize-deps": "^0.9.0",
125-
"vite-tsconfig-paths": "^5.0.0",
126121
"vitest": "3.0.5",
127122
"vitest-canvas-mock": "^0.3.3"
128123
},

0 commit comments

Comments
 (0)