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

Non-trivial merge to 0.23 #5506

Merged
merged 36 commits into from
Nov 1, 2021
Merged

Conversation

rossabaker
Copy link
Member

No description provided.

m3is0 and others added 30 commits October 11, 2021 08:07
This reverts commit 0479f11, reversing
changes made to 517fe58.
Remove redundant setting in scalafix build
Remove redundant val in the `Header.Raw` constructor
Fix `scaladoc` for some `Headers` methods
Fix Origin parsing on hosts starting with a number
@rossabaker
Copy link
Member Author

A bunch of jobs got kill -9'ed. Restarting to see if it was a GitHub flake.

@rossabaker
Copy link
Member Author

And the build matrix isn't as spare as it ought to be.

@bplommer
Copy link
Member

bplommer commented Nov 1, 2021

Just re-triggered it and same deal. Any idea what's going on here?

@armanbilge
Copy link
Member

Ah, I know what's going on. The ci thing which segregates JVM/JS builds in the matrix went missing. So now it's trying to do both at the same time and Scala.js linking step is extremely memory-intensive. So GH is killing the job.

@@ -65,27 +77,27 @@ jobs:

- name: Check formatting
if: matrix.scala != '3.1.0'
run: sbt ++${{ matrix.scala }} '${{ matrix.ci }}' scalafmtCheckAll
Copy link
Member

Choose a reason for hiding this comment

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

This ${{ matrix.ci }} is what was used to to set the root project to either rootJVM or rootJS.

Copy link
Member

Choose a reason for hiding this comment

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

I doubt Ross would mind if you felt like pushing a fix 😄

Copy link
Member Author

Choose a reason for hiding this comment

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

Oh, something in the merge made it look like that had been intentionally removed, and I didn't understand it, so I played along.

@rossabaker
Copy link
Member Author

Nice green checkmark for a build so broken that didn't run at all.

@rossabaker rossabaker merged commit b432a02 into series/0.23 Nov 1, 2021
@rossabaker rossabaker deleted the non-trivial-merge-2020-10-27 branch November 1, 2021 17:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants