Skip to content

Commit

Permalink
Merge pull request #23004 from storybookjs/minor-release-fixes
Browse files Browse the repository at this point in the history
Release: Don't reference prototype repository
  • Loading branch information
JReinhold authored Jun 9, 2023
2 parents abfc677 + e8389e5 commit 502e01d
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 20 deletions.
18 changes: 9 additions & 9 deletions scripts/release/__tests__/generate-pr-description.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ describe('Generate PR Description', () => {
labels: null,
links: {
commit:
'[`012b58140c3606efeacbe99c0c410624b0a1ed1f`](https://github.com/storybookjs/monorepo-release-tooling-prototype/commit/012b58140c3606efeacbe99c0c410624b0a1ed1f)',
'[`012b58140c3606efeacbe99c0c410624b0a1ed1f`](https://github.com/storybookjs/storybook/commit/012b58140c3606efeacbe99c0c410624b0a1ed1f)',
pull: null,
user: '[@github-actions[bot]](https://github.com/github-actions%5Bbot%5D)',
},
Expand Down Expand Up @@ -219,11 +219,11 @@ 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 doing the above QA (change PR titles, revert PRs), manually trigger a re-generation of this PR with [this workflow](https://github.com/storybookjs/monorepo-release-tooling-prototype/actions/workflows/prepare-prerelease.yml) and wait for it to finish. It will wipe your progress in this to do, which is expected.
If you\\'ve made any changes doing the above QA (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. It will wipe your progress in this to do, which is expected.
When everything above is done:
- [ ] Merge this PR
- [ ] [Follow the publish workflow run and see it finishes succesfully](https://github.com/storybookjs/monorepo-release-tooling-prototype/actions/workflows/publish.yml)
- [ ] [Follow the publish workflow run and see it finishes succesfully](https://github.com/storybookjs/storybook/actions/workflows/publish.yml)
---
Expand Down Expand Up @@ -270,11 +270,11 @@ 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/monorepo-release-tooling-prototype/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-prerelease.yml) and wait for it to finish.
When everything above is done:
- [ ] Merge this PR
- [ ] [Approve the publish workflow run](https://github.com/storybookjs/monorepo-release-tooling-prototype/actions/workflows/publish.yml)"
- [ ] [Approve the publish workflow run](https://github.com/storybookjs/storybook/actions/workflows/publish.yml)"
`);
});

Expand Down Expand Up @@ -334,11 +334,11 @@ For each pull request below, you need to either manually cherry pick it, or disc
If you\\'ve made any changes doing the above QA (change PR titles, revert PRs), manually trigger a re-generation of this PR with [this workflow](https://github.com/storybookjs/monorepo-release-tooling-prototype/actions/workflows/prepare-prerelease.yml) and wait for it to finish. It will wipe your progress in this to do, which is expected.
If you\\'ve made any changes doing the above QA (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. It will wipe your progress in this to do, which is expected.
When everything above is done:
- [ ] Merge this PR
- [ ] [Follow the publish workflow run and see it finishes succesfully](https://github.com/storybookjs/monorepo-release-tooling-prototype/actions/workflows/publish.yml)
- [ ] [Follow the publish workflow run and see it finishes succesfully](https://github.com/storybookjs/storybook/actions/workflows/publish.yml)
---
Expand Down Expand Up @@ -380,11 +380,11 @@ 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/monorepo-release-tooling-prototype/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-prerelease.yml) and wait for it to finish.
When everything above is done:
- [ ] Merge this PR
- [ ] [Approve the publish workflow run](https://github.com/storybookjs/monorepo-release-tooling-prototype/actions/workflows/publish.yml)"
- [ ] [Approve the publish workflow run](https://github.com/storybookjs/storybook/actions/workflows/publish.yml)"
`);
});
});
Expand Down
10 changes: 5 additions & 5 deletions scripts/release/__tests__/label-patches.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ const remoteMock = [
{
name: 'origin',
refs: {
fetch: 'https://github.com/storybookjs/monorepo-release-tooling-prototype.git',
push: 'https://github.com/storybookjs/monorepo-release-tooling-prototype.git',
fetch: 'https://github.com/storybookjs/storybook.git',
push: 'https://github.com/storybookjs/storybook.git',
},
},
];
Expand Down Expand Up @@ -60,8 +60,8 @@ const pullInfoMock = {
labels: ['documentation', 'patch', 'picked'],
links: {
commit:
'[`930b47f011f750c44a1782267d698ccdd3c04da3`](https://github.com/storybookjs/monorepo-release-tooling-prototype/commit/930b47f011f750c44a1782267d698ccdd3c04da3)',
pull: '[#55](https://github.com/storybookjs/monorepo-release-tooling-prototype/pull/55)',
'[`930b47f011f750c44a1782267d698ccdd3c04da3`](https://github.com/storybookjs/storybook/commit/930b47f011f750c44a1782267d698ccdd3c04da3)',
pull: '[#55](https://github.com/storybookjs/storybook/pull/55)',
user: '[@JReinhold](https://github.com/JReinhold)',
},
};
Expand Down Expand Up @@ -125,7 +125,7 @@ test('it should label the PR associated with cheery picks in the current branch'
"- Looking for latest tag\\n",
"✔ Found latest tag: v7.2.1\\n",
"- Looking at cherry pick commits since v7.2.1\\n",
"✔ Found the following picks 🍒:\\n Commit: 930b47f011f750c44a1782267d698ccdd3c04da3\\n PR: [#55](https://github.com/storybookjs/monorepo-release-tooling-prototype/pull/55)\\n",
"✔ Found the following picks 🍒:\\n Commit: 930b47f011f750c44a1782267d698ccdd3c04da3\\n PR: [#55](https://github.com/storybookjs/storybook/pull/55)\\n",
"- Labeling the PRs with the picked label...\\n",
"✔ Successfully labeled all PRs with the picked label.\\n"
]
Expand Down
8 changes: 4 additions & 4 deletions scripts/release/generate-pr-description.ts
Original file line number Diff line number Diff line change
Expand Up @@ -179,11 +179,11 @@ export const generateReleaseDescription = ({
${manualCherryPicks || ''}
If you've made any changes doing the above QA (change PR titles, revert PRs), manually trigger a re-generation of this PR with [this workflow](https://github.com/storybookjs/monorepo-release-tooling-prototype/actions/workflows/prepare-prerelease.yml) and wait for it to finish. It will wipe your progress in this to do, which is expected.
If you've made any changes doing the above QA (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. It will wipe your progress in this to do, which is expected.
When everything above is done:
- [ ] Merge this PR
- [ ] [Follow the publish workflow run and see it finishes succesfully](https://github.com/storybookjs/monorepo-release-tooling-prototype/actions/workflows/publish.yml)
- [ ] [Follow the publish workflow run and see it finishes succesfully](https://github.com/storybookjs/storybook/actions/workflows/publish.yml)
---
Expand Down Expand Up @@ -212,11 +212,11 @@ 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/monorepo-release-tooling-prototype/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-prerelease.yml) and wait for it to finish.
When everything above is done:
- [ ] Merge this PR
- [ ] [Approve the publish workflow run](https://github.com/storybookjs/monorepo-release-tooling-prototype/actions/workflows/publish.yml)`
- [ ] [Approve the publish workflow run](https://github.com/storybookjs/storybook/actions/workflows/publish.yml)`
// don't mention contributors in the release PR, to avoid spamming them
.replaceAll('[@', '[@ ')
.replaceAll('"', '\\"')
Expand Down
2 changes: 1 addition & 1 deletion scripts/release/pick-patches.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ program.name('pick-patches').description('Cherry pick patch PRs back to main');
const logger = console;

const OWNER = 'storybookjs';
const REPO = 'monorepo-release-tooling-prototype';
const REPO = 'storybook';
const SOURCE_BRANCH = 'next';

const git = simpleGit();
Expand Down
2 changes: 1 addition & 1 deletion scripts/release/utils/get-unpicked-prs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export async function getUnpickedPRs(baseBranch: string, verbose?: boolean): Pro
`,
{
owner: 'storybookjs',
repo: 'monorepo-release-tooling-prototype',
repo: 'storybook',
order: {
field: 'UPDATED_AT',
direction: 'ASC',
Expand Down

0 comments on commit 502e01d

Please sign in to comment.