From b038ddec56c67b9a7c6553b2591f7327be1e3368 Mon Sep 17 00:00:00 2001 From: ryanbas21 Date: Thu, 7 Nov 2024 09:44:30 -0700 Subject: [PATCH 1/2] chore: remove internal scripts and fix ci publish --- .changeset/config.json | 13 ++++++++++++- .github/workflows/publish.yml | 7 +++++-- package.json | 2 +- packages/javascript-sdk/package.json | 3 --- packages/ping-protect/package.json | 3 --- packages/token-vault/package.json | 3 --- 6 files changed, 18 insertions(+), 13 deletions(-) diff --git a/.changeset/config.json b/.changeset/config.json index e9e8e1904..963a6997b 100644 --- a/.changeset/config.json +++ b/.changeset/config.json @@ -12,5 +12,16 @@ "access": "public", "baseBranch": "master", "updateInternalDependencies": "patch", - "ignore": [] + "ignore": [ + "@forgerock/device-client", + "@forgerock/davinci-client", + "autoscript-apps", + "autoscript-suites", + "davinci-app", + "mock-api", + "token-vault-app", + "@forgerock/token-vault-interceptor", + "token-vault-proxy", + "token-vault-suites" + ] } diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 75451fbd0..3c3915a84 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -44,6 +44,9 @@ jobs: - run: git config --global user.email "${{ steps.import-gpg.outputs.email }}" - run: git config --global user.name "github-actions[bot]" + - name: Setup npmrc + run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_ACCESS_TOKEN }}" > .npmrc + - run: pnpm install --frozen-lockfile # This line enables distribution @@ -76,7 +79,7 @@ jobs: uses: changesets/action@v1 id: changesets with: - publish: pnpm ci:release + publish: pnpm ci:release --no-git-checks title: Release PR branch: master setupGitUser: false @@ -85,7 +88,6 @@ jobs: HOME: ${{ github.workspace }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} NPM_CONFIG_PROVENANCE: true - NPM_TOKEN: ${{ secrets.NPM_ACCESS_TOKEN }} - name: rebase develop with main on publish if: ${{ steps.changesets.outputs.published == 'true' }} @@ -100,3 +102,4 @@ jobs: git push -f env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + NPM_CONFIG_PROVENANCE: true diff --git a/package.json b/package.json index 696afc91a..a3c41f560 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "scripts": { "build": "nx affected --target=build", "clean": "shx rm -rf ./{coverage,dist,docs,node_modules,tmp}/ ./{packages,e2e}/*/{dist,node_modules}/ && git clean -fX -e \"!.env*,nx-cloud.env\"", - "ci:release": "pnpm -r release", + "ci:release": "pnpm publish -r && changeset tag", "changeset": "pnpm changeset", "commit": "git cz", "docs": "nx affected --target=typedoc", diff --git a/packages/javascript-sdk/package.json b/packages/javascript-sdk/package.json index 21486cf4a..f51190056 100644 --- a/packages/javascript-sdk/package.json +++ b/packages/javascript-sdk/package.json @@ -51,9 +51,6 @@ } }, "type": "module", - "scripts": { - "release": "pnpm publish" - }, "devDependencies": { "vitest": "^1.4.0" } diff --git a/packages/ping-protect/package.json b/packages/ping-protect/package.json index d07c9a44f..b03a8de19 100644 --- a/packages/ping-protect/package.json +++ b/packages/ping-protect/package.json @@ -21,8 +21,5 @@ "types": "./dist/index.ts.d.ts", "peerDependencies": { "@forgerock/javascript-sdk": "workspace:*" - }, - "scripts": { - "release": "pnpm publish" } } diff --git a/packages/token-vault/package.json b/packages/token-vault/package.json index 42949ebaf..8923a3041 100644 --- a/packages/token-vault/package.json +++ b/packages/token-vault/package.json @@ -22,8 +22,5 @@ }, "peerDependencies": { "@forgerock/javascript-sdk": "workspace:*" - }, - "scripts": { - "release": "pnpm publish" } } From 4ef6a47899230779c46eefc1c9333102b8c4fb0c Mon Sep 17 00:00:00 2001 From: ryanbas21 Date: Thu, 7 Nov 2024 09:59:58 -0700 Subject: [PATCH 2/2] chore: remove internal scripts and fix ci publish --- .github/workflows/publish.yml | 9 ++++----- package.json | 3 ++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 3c3915a84..309719a63 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -44,9 +44,6 @@ jobs: - run: git config --global user.email "${{ steps.import-gpg.outputs.email }}" - run: git config --global user.name "github-actions[bot]" - - name: Setup npmrc - run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_ACCESS_TOKEN }}" > .npmrc - - run: pnpm install --frozen-lockfile # This line enables distribution @@ -79,7 +76,8 @@ jobs: uses: changesets/action@v1 id: changesets with: - publish: pnpm ci:release --no-git-checks + publish: pnpm ci:release + version: pnpm ci:version title: Release PR branch: master setupGitUser: false @@ -87,7 +85,8 @@ jobs: # See https://github.com/changesets/action/issues/147 HOME: ${{ github.workspace }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - NPM_CONFIG_PROVENANCE: true + NPM_CONFIG_PROVENANCE: 'true' + NPM_TOKEN: ${{ secrets.NPM_ACCESS_TOKEN }} - name: rebase develop with main on publish if: ${{ steps.changesets.outputs.published == 'true' }} diff --git a/package.json b/package.json index a3c41f560..830f084a6 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,8 @@ "scripts": { "build": "nx affected --target=build", "clean": "shx rm -rf ./{coverage,dist,docs,node_modules,tmp}/ ./{packages,e2e}/*/{dist,node_modules}/ && git clean -fX -e \"!.env*,nx-cloud.env\"", - "ci:release": "pnpm publish -r && changeset tag", + "ci:release": "pnpm publish -r --no-git-checks && changeset tag", + "ci:version": "changeset version && pnpm install --no-frozen-lockfile", "changeset": "pnpm changeset", "commit": "git cz", "docs": "nx affected --target=typedoc",