From 06ce21d8703e566adb8db5333efc08b26030dced Mon Sep 17 00:00:00 2001 From: Jeppe Reinhold Date: Fri, 23 Jun 2023 12:56:35 +0200 Subject: [PATCH 1/4] don't trigger CI on release PRs per default --- .github/workflows/trigger-circle-ci-workflow.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/trigger-circle-ci-workflow.yml b/.github/workflows/trigger-circle-ci-workflow.yml index 78de059ad4e3..7b1f853bde1e 100644 --- a/.github/workflows/trigger-circle-ci-workflow.yml +++ b/.github/workflows/trigger-circle-ci-workflow.yml @@ -9,8 +9,6 @@ on: branches: - next - main - - version-prerelease-from-** - - version-patch-from-** jobs: get-branch: @@ -56,7 +54,7 @@ jobs: trigger-pr-tests: runs-on: ubuntu-latest needs: get-branch - if: github.event_name == 'pull_request_target' && ((github.event.pull_request.draft == false || contains(github.event.pull_request.labels.*.name, 'ci:pr')) && !contains(github.event.pull_request.labels.*.name, 'ci:merged') && !contains(github.event.pull_request.labels.*.name, 'ci:daily')) + if: github.event_name == 'pull_request_target' && (((github.event.pull_request.draft == false && !contains(github.event.pull_request.labels.*.name, 'release')) || contains(github.event.pull_request.labels.*.name, 'ci:pr')) && !contains(github.event.pull_request.labels.*.name, 'ci:merged') && !contains(github.event.pull_request.labels.*.name, 'ci:daily')) steps: - name: Trigger PR tests run: > @@ -109,4 +107,4 @@ jobs: }' env: CIRCLE_CI_TOKEN: ${{ secrets.CIRCLE_CI_TOKEN }} - BRANCH: ${{ needs.get-branch.outputs.branch }} \ No newline at end of file + BRANCH: ${{ needs.get-branch.outputs.branch }} From 9f6b3bbd319bbb7afd9a089a6adead5c50a82ab1 Mon Sep 17 00:00:00 2001 From: Jeppe Reinhold Date: Fri, 23 Jun 2023 13:02:25 +0200 Subject: [PATCH 2/4] add line about CI in release PR description --- scripts/release/generate-pr-description.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/release/generate-pr-description.ts b/scripts/release/generate-pr-description.ts index 55c1531aa04f..3c4e207349b2 100644 --- a/scripts/release/generate-pr-description.ts +++ b/scripts/release/generate-pr-description.ts @@ -150,6 +150,7 @@ export const generateReleaseDescription = ({ Before merging the PR, there are a few QA steps to go through: - [ ] Add the "freeze" label to this PR, to ensure it doesn't get automatically forced pushed by new changes. + - [ ] Add the "ci:daily" label to this PR, to trigger the full test suite to run on this PR. And for each change below: @@ -201,7 +202,7 @@ export const generateNonReleaseDescription = ( ${manualCherryPicks || ''} - If you've made any changes (change PR titles, revert PRs), manually trigger a re-generation of this PR with [this workflow](https://github.com/storybookjs/storybook/actions/workflows/prepare-prerelease.yml) and wait for it to finish. + If you've made any changes (change PR titles, revert PRs), manually trigger a re-generation of this PR with [this workflow](https://github.com/storybookjs/storybook/actions/workflows/prepare-patch-release.yml) and wait for it to finish. When everything above is done: - Merge this PR From 12a61bc9cbdb9f18b4429923eee8286abb4c7677 Mon Sep 17 00:00:00 2001 From: Jeppe Reinhold Date: Fri, 23 Jun 2023 13:04:12 +0200 Subject: [PATCH 3/4] add todo to non-release pr descriptions --- scripts/release/generate-pr-description.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/release/generate-pr-description.ts b/scripts/release/generate-pr-description.ts index 9af509800a33..363520474e88 100644 --- a/scripts/release/generate-pr-description.ts +++ b/scripts/release/generate-pr-description.ts @@ -200,6 +200,13 @@ export const generateNonReleaseDescription = ( dedent`This is an automated pull request. None of the changes requires a version bump, they are only internal or documentation related. Merging this PR will not trigger a new release, but documentation will be updated. If you're not a core maintainer with permissions to release you can ignore this pull request. + ## To do + + Before merging the PR: + + - [ ] Add the "freeze" label to this PR, to ensure it doesn't get automatically forced pushed by new changes. + - [ ] Add the "ci:daily" label to this PR, to trigger the full test suite to run on this PR. + This is a list of all the PRs merged and commits pushed directly to \`next\` since the last release: ${changeList} From ce80cf08830dc37a5b32e8262442992f89a679b5 Mon Sep 17 00:00:00 2001 From: Jeppe Reinhold Date: Fri, 23 Jun 2023 13:05:23 +0200 Subject: [PATCH 4/4] update snapshots --- .../__tests__/generate-pr-description.test.ts | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/scripts/release/__tests__/generate-pr-description.test.ts b/scripts/release/__tests__/generate-pr-description.test.ts index 5323f6bc2a87..b96d466514ed 100644 --- a/scripts/release/__tests__/generate-pr-description.test.ts +++ b/scripts/release/__tests__/generate-pr-description.test.ts @@ -174,6 +174,7 @@ For each pull request below, you need to either manually cherry pick it, or disc Before merging the PR, there are a few QA steps to go through: - [ ] Add the \\"freeze\\" label to this PR, to ensure it doesn\\'t get automatically forced pushed by new changes. + - [ ] Add the \\"ci:daily\\" label to this PR, to trigger the full test suite to run on this PR. And for each change below: @@ -235,6 +236,13 @@ For each pull request below, you need to either manually cherry pick it, or disc "This is an automated pull request. None of the changes requires a version bump, they are only internal or documentation related. Merging this PR will not trigger a new release, but documentation will be updated. If you\\'re not a core maintainer with permissions to release you can ignore this pull request. + ## To do + + Before merging the PR: + + - [ ] Add the \\"freeze\\" label to this PR, to ensure it doesn\\'t get automatically forced pushed by new changes. + - [ ] Add the \\"ci:daily\\" label to this PR, to trigger the full test suite to run on this PR. + This is a list of all the PRs merged and commits pushed directly to \\\`next\\\` since the last release: - **🐛 Bug**: Some PR title for a bug [#42](https://github.com/storybookjs/storybook/pull/42) @@ -263,7 +271,7 @@ For each pull request below, you need to either manually cherry pick it, or disc - [ ] [#42](https://github.com/storybookjs/storybook/pull/42): \\\`git cherry-pick -m1 -x abc123\\\` - If you\\'ve made any changes (change PR titles, revert PRs), manually trigger a re-generation of this PR with [this workflow](https://github.com/storybookjs/storybook/actions/workflows/prepare-prerelease.yml) and wait for it to finish. + If you\\'ve made any changes (change PR titles, revert PRs), manually trigger a re-generation of this PR with [this workflow](https://github.com/storybookjs/storybook/actions/workflows/prepare-patch-release.yml) and wait for it to finish. When everything above is done: - Merge this PR @@ -294,6 +302,7 @@ For each pull request below, you need to either manually cherry pick it, or disc Before merging the PR, there are a few QA steps to go through: - [ ] Add the \\"freeze\\" label to this PR, to ensure it doesn\\'t get automatically forced pushed by new changes. + - [ ] Add the \\"ci:daily\\" label to this PR, to trigger the full test suite to run on this PR. And for each change below: @@ -350,6 +359,13 @@ For each pull request below, you need to either manually cherry pick it, or disc "This is an automated pull request. None of the changes requires a version bump, they are only internal or documentation related. Merging this PR will not trigger a new release, but documentation will be updated. If you\\'re not a core maintainer with permissions to release you can ignore this pull request. + ## To do + + Before merging the PR: + + - [ ] Add the \\"freeze\\" label to this PR, to ensure it doesn\\'t get automatically forced pushed by new changes. + - [ ] Add the \\"ci:daily\\" label to this PR, to trigger the full test suite to run on this PR. + This is a list of all the PRs merged and commits pushed directly to \\\`next\\\` since the last release: - **🐛 Bug**: Some PR title for a bug [#42](https://github.com/storybookjs/storybook/pull/42) @@ -373,7 +389,7 @@ For each pull request below, you need to either manually cherry pick it, or disc - If you\\'ve made any changes (change PR titles, revert PRs), manually trigger a re-generation of this PR with [this workflow](https://github.com/storybookjs/storybook/actions/workflows/prepare-prerelease.yml) and wait for it to finish. + If you\\'ve made any changes (change PR titles, revert PRs), manually trigger a re-generation of this PR with [this workflow](https://github.com/storybookjs/storybook/actions/workflows/prepare-patch-release.yml) and wait for it to finish. When everything above is done: - Merge this PR