Skip to content
New issue

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

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

Already on GitHub? # to your account

Merge 2.2.x after 2.2.0-M3 release #3475

Merged
merged 5 commits into from
Jun 17, 2020
Merged

Merge 2.2.x after 2.2.0-M3 release #3475

merged 5 commits into from
Jun 17, 2020

Conversation

travisbrown
Copy link
Contributor

I went ahead and removed the Scala.js cross-publishing script, but we can always recover it from the history if we need to publish for 0.6 again.

Please note that this needs to be a merge commit! If we squash or rebase, then the 2.2.0-M3 tag won't be on master.

@travisbrown travisbrown requested review from barambani and LukaJCB June 17, 2020 12:42
@codecov-commenter
Copy link

codecov-commenter commented Jun 17, 2020

Codecov Report

Merging #3475 into master will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #3475   +/-   ##
=======================================
  Coverage   91.77%   91.77%           
=======================================
  Files         383      383           
  Lines        8394     8394           
  Branches      212      204    -8     
=======================================
  Hits         7704     7704           
  Misses        690      690           

Copy link
Contributor

@barambani barambani left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎉

@travisbrown travisbrown merged commit c3854f4 into master Jun 17, 2020
@LukaJCB LukaJCB deleted the 2.2.x branch June 17, 2020 15:05
@travisbrown
Copy link
Contributor Author

@LukaJCB This definitely isn't a big deal, but we'll need the 2.2.x branch for at least the next couple of releases. I've just been following PROCESS.md on this: merge master into 2.2.x, push and publish from there, and then PR 2.2.x back onto master. There's no reason I guess that 2.2.x has to stay on GitHub in the meantime, but I think it makes things a little clearer.

@LukaJCB
Copy link
Member

LukaJCB commented Jun 17, 2020

oh sorry, I must've done that completely subconsciously, I don't even remember doing it.

@travisbrown travisbrown added this to the 2.2.0-RC1 milestone Jun 22, 2020
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants