From 272b90ab26675968f057b7d44eff376b12be14f9 Mon Sep 17 00:00:00 2001 From: Paul Schultz Date: Thu, 17 Oct 2024 23:59:24 -0500 Subject: [PATCH 1/2] chore(release): add lockfiles in release Signed-off-by: Paul Schultz --- .github/workflows/release.yaml | 4 ++++ package.json | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 653dc2e1dc..6b8d751a68 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -8,6 +8,10 @@ on: - 1.2.x - release-[0-9].[0-9]* +env: + TURBO_SCM_BASE: ${{ github.event.before }} + TURBO_SCM_HEAD: ${{ github.sha }} + # enforce only one release action per release branch at a time concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/package.json b/package.json index 3d47f66bc0..b2e1d031db 100644 --- a/package.json +++ b/package.json @@ -26,9 +26,10 @@ "new": "janus-cli new --do-not-edit-packages", "prepare": "husky install", "export-dynamic": "turbo run export-dynamic", - "versions:bump": "backstage-cli versions:bump && find . -name 'package.json' ! -path '*/node_modules/*' -exec sed -i -e '/devDependencies/,/\\\\}/{ s/\\\"\\\\^/\\\"/; }' {} ; && yarn install && yarn run export-dynamic --no-cache -- -- --clean", - "packages:version": "changeset version && yarn install", - "packages:publish": "turbo build --concurrency=75% --filter=@janus-idp/* && changeset publish" + "export-dynamic:clean": "turbo run export-dynamic -- -- --clean", + "versions:bump": "backstage-cli versions:bump && find . -name 'package.json' ! -path '*/node_modules/*' -exec sed -i -e '/devDependencies/,/\\\\}/{ s/\\\"\\\\^/\\\"/; }' {} ; && yarn install && turbo run export-dynamic:clean", + "packages:version": "changeset version && yarn install && turbo run export-dynamic:clean --concurrency=75% --affected && git add .\\*package.json .\\*yarn.lock", + "packages:publish": "turbo run build --concurrency=75% --filter=@janus-idp/* && changeset publish" }, "workspaces": { "packages": [ From 80f48ff61605fabcf73d25b66630614c8556722e Mon Sep 17 00:00:00 2001 From: Paul Schultz Date: Fri, 18 Oct 2024 00:02:12 -0500 Subject: [PATCH 2/2] add exception to changeset status Signed-off-by: Paul Schultz --- .github/workflows/pr-test.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pr-test.yaml b/.github/workflows/pr-test.yaml index 55970449a9..f17231ada5 100644 --- a/.github/workflows/pr-test.yaml +++ b/.github/workflows/pr-test.yaml @@ -40,6 +40,7 @@ jobs: yarn install - name: Verify changesets + if: github.actor != 'janus-idp[bot]' run: | yarn changeset status --since=${{ github.event.pull_request.base.sha }}