Skip to content

Fix PR creation in web and styleguide when releasing #2892

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Apr 17, 2020
Merged

Fix PR creation in web and styleguide when releasing #2892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
af304dd
Moved access_token from CURL POST url to -H
Apr 3, 2020
051fc2b
Use the 'Polaris Project Automation Token' in 1Password
honkfestival Apr 15, 2020
bb01a15
Add yarn-deduplicate for polaris-icons and polaris-tokens
Apr 16, 2020
3e8c3ad
Update new-version-pr-generator.js
Apr 16, 2020
7fd3007
Merge branch 'master' into pr-generator-api-change
Apr 16, 2020
5da8c73
Add changelog
Apr 16, 2020
56a0a48
Update UNRELEASED.md
Apr 16, 2020
30388b7
Update UNRELEASED.md
Apr 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions UNRELEASED.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@

### Development workflow

- Fixed automatic pull request generation for `web` and `styleguide` when updating Polaris ([#2892](https://github.com/Shopify/polaris-react/pull/2892))

### Dependency upgrades

### Code quality
Expand Down
3 changes: 2 additions & 1 deletion scripts/new-version-pr-generator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ const jobs = repositories.map((repository) => {
'v',
'',
)} --no-progress --ignore-engines`,
'npx yarn-deduplicate --packages @shopify/polaris-icons,@shopify/polaris-tokens yarn.lock',
`git add package.json yarn.lock`,
`${shopifyPolarisBotGitOverride} git commit -m "Update @shopify/polaris to ${releaseVersion}" --author "${polarisBotName} <${polarisBotEmail}>" -m "${releaseVersion}" --allow-empty`,
`git push origin update-polaris-${releaseVersion}`,
Expand All @@ -147,7 +148,7 @@ const jobs = repositories.map((repository) => {
body: pullRequestTemplate(repository, releaseVersion),
head: `update-polaris-${releaseVersion}`,
base: baseBranch,
})}' -X POST https://api.github.com/repos/shopify/${repository}/pulls?access_token=${polarisBotToken}`,
})}' -H 'Authorization: token ${polarisBotToken}' -X POST https://api.github.com/repos/shopify/${repository}/pulls`,
];

for (const command of commands) {
Expand Down
2 changes: 1 addition & 1 deletion secrets.ejson
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"_public_key": "a1c9cbd92a9c1c9bb3784446dfc76df20c6e0a89c3ea2e24b47d7cff76269471",
"github": {
"shopify-polaris": "EJ[1:3N1z9LVJ2geRw+nSN918evYGFXmlP++MLRzGERTpc18=:eESZh5rxAQiwDwyWYjh+fAX724CUucRs:4/5j6lTePdDnG+VNaolGeD0SjPSymIzMQ/25wgkPFq1NP0VHooKf4dzS3rLyzBoGxiR0h9Nq9yU=]"}
"shopify-polaris": "EJ[1:vKWutvUDBDAbjLfRgERxjGEPwOdIr3ZPTYaqcj7XN0o=:f3B9wqrYArVJsO9K/NaqWAe6wOsGc4cp:c83kVnfmilvYK1Z8XG2j5IOtFUyj38D61UBtmILewJmOWK56Beva1znInE0AxuCNUH8Op4PoIBo=]"}
}