Skip to content
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.

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

Merge patch 1.46.1 release artifacts back into master #6343

Merged
merged 5 commits into from Jul 9, 2019

Conversation

Projects
2 participants
@pmuens
Copy link
Member

commented Jul 8, 2019

Merging the Patch release artifacts (e.g. updates to CHANGELOG.md) back into master to keep the history.

IMPORTANT: Don't delete the branch after merging as we might have other patch releases we want to do and need to merge back into master once released.

Todos:

Note: Run npm run test-ci to run all validation checks on proposed changes

  • Ensure there are no lint errors.
    Validate via npm run lint-updated
    Note: Some reported issues can be automatically fixed by running npm run lint:fix
  • Ensure introduced changes match Prettier formatting.
    Validate via npm run prettier-check-updated
    Note: All reported issues can be automatically fixed by running npm run prettify-updated
  • Make sure code coverage hasn't dropped
  • Provide verification config / commands / resources
  • Enable "Allow edits from maintainers" for this PR
  • Update the messages below

Is this ready for review?: YES
Is it a breaking change?: NO

medikoo and others added some commits Jun 28, 2019

@pmuens pmuens added the pr/in-review label Jul 8, 2019

@pmuens pmuens requested a review from medikoo Jul 8, 2019

@pmuens pmuens added this to In progress in Serverless via automation Jul 8, 2019

@pmuens pmuens self-assigned this Jul 8, 2019

@medikoo
Copy link
Member

left a comment

Prettier check failed on CHANGELOG.md

@pmuens pmuens requested a review from medikoo Jul 8, 2019

@medikoo

medikoo approved these changes Jul 8, 2019

Serverless automation moved this from In progress to Reviewer approved Jul 8, 2019

@medikoo

This comment has been minimized.

Copy link
Member

commented Jul 8, 2019

There's just one small issue, that this PR rewrites some commits which are already in master.

It's nothing big, but affects diff of this PR and adds noise to repo history

@pmuens

This comment has been minimized.

Copy link
Member Author

commented Jul 9, 2019

Thanks for reviewing @medikoo 👍

Yes, that diff is a bit ugly but we can't rebase this PR since we might want to do another patch release based off of this branch. I'll just merge it for now since this PR only introduces minor changes.

@pmuens pmuens merged commit 02304f5 into master Jul 9, 2019

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
security/snyk - package.json (medikoo) No new issues
Details

Serverless automation moved this from Reviewer approved to Done Jul 9, 2019

@pmuens pmuens deleted the patch-1-46-x branch Jul 10, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.