Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Merge 2.0.1 backport branch into mainline master - #7842

Merged
gnunicorn merged 12 commits into
masterfrom
igor-v2-backports-forwardmerge
Jan 11, 2021
Merged

Merge 2.0.1 backport branch into mainline master#7842
gnunicorn merged 12 commits into
masterfrom
igor-v2-backports-forwardmerge

Conversation

@Xanewok

@Xanewok Xanewok commented Jan 6, 2021

Copy link
Copy Markdown
Contributor

This is #7686 (reviewed and accepted) but targeting master to retain future release tag in the master history line.

@Xanewok
Xanewok requested a review from gnunicorn January 6, 2021 18:13
@github-actions github-actions Bot added the A0-please_review Pull request needs code review. label Jan 6, 2021
@Xanewok
Xanewok requested a review from bkchr January 6, 2021 18:15
@Xanewok
Xanewok force-pushed the igor-v2-backports-forwardmerge branch from 1974065 to 19610f9 Compare January 6, 2021 18:27
@Xanewok

Xanewok commented Jan 6, 2021

Copy link
Copy Markdown
Contributor Author

It's worth noting that this should be merged directly rather than squashed, as the point is to retain connection with backports from #7842 done on top of v2.0.0 tag via latest 19610f9 merge commit.

@Xanewok Xanewok added the B0-silent Changes should not be mentioned in any release notes label Jan 6, 2021
@Xanewok

Xanewok commented Jan 6, 2021

Copy link
Copy Markdown
Contributor Author

I'm somewhat torn on B-* labels - at the same time it's not really important in terms of API changes, runtime etc. but these definitely should be documented as a patch release. Leaving as B0-silent for now.

@gnunicorn Polkadot CI check is green now (thanks @bkchr) and everything seems to be good to go. Should we merge this?

@gnunicorn gnunicorn added the C1-low PR touches the given topic and has a low impact on builders. label Jan 6, 2021
@Xanewok

Xanewok commented Jan 6, 2021

Copy link
Copy Markdown
Contributor Author

We should probably backport #7838 as well. Will do that tomorrow.

This is done because at the time of writing cargo-unleash does not fully
support partial workspace publishing and mixes both local and crates.io
versions of the packages, leading to errors in the release check workflow.
...to fix compilation error when using futures-* v0.3.9.
@Xanewok
Xanewok force-pushed the igor-v2-backports-forwardmerge branch from 19610f9 to 6887dd9 Compare January 8, 2021 18:38
@Xanewok

Xanewok commented Jan 8, 2021

Copy link
Copy Markdown
Contributor Author

@gnunicorn updated with latest changes from #7686, hopefully this should be good to go once CI agrees

@Xanewok

Xanewok commented Jan 8, 2021

Copy link
Copy Markdown
Contributor Author

All is green so tagging #7686 for 2.0.1 release.

@Xanewok
Xanewok force-pushed the igor-v2-backports-forwardmerge branch from 6887dd9 to e0fee22 Compare January 8, 2021 19:39
@Xanewok

Xanewok commented Jan 8, 2021

Copy link
Copy Markdown
Contributor Author

Force-pushed a new merge commit that includes a new signed commit for 2.0.1 (2cd2096).

@Xanewok

Xanewok commented Jan 8, 2021

Copy link
Copy Markdown
Contributor Author

Blocked on #7844.

@gnunicorn
gnunicorn merged commit 00b41bc into master Jan 11, 2021
@gnunicorn
gnunicorn deleted the igor-v2-backports-forwardmerge branch January 11, 2021 10:24
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

A0-please_review Pull request needs code review. B0-silent Changes should not be mentioned in any release notes C1-low PR touches the given topic and has a low impact on builders.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants