Skip to content

[nomerge] fix our Windows Jenkins job (sbt 1.3 upgrade broke it)#8703

Merged
SethTisue merged 1 commit intoscala:2.12.xfrom
SethTisue:sd-666
Feb 8, 2020
Merged

[nomerge] fix our Windows Jenkins job (sbt 1.3 upgrade broke it)#8703
SethTisue merged 1 commit intoscala:2.12.xfrom
SethTisue:sd-666

Conversation

@SethTisue
Copy link
Member

@SethTisue SethTisue commented Feb 8, 2020

@scala-jenkins scala-jenkins added this to the 2.12.12 milestone Feb 8, 2020
@SethTisue
Copy link
Member Author

there is already a green Windows run for this at https://scala-ci.typesafe.com/view/scala-2.12.x/job/scala-2.12.x-integrate-windows/1649/

@SethTisue SethTisue added the internal not resulting in user-visible changes (build changes, tests, internal cleanups) label Feb 8, 2020
@SethTisue SethTisue modified the milestones: 2.12.12, 2.12.11 Feb 8, 2020
@SethTisue SethTisue merged commit 603a702 into scala:2.12.x Feb 8, 2020
@SethTisue SethTisue deleted the sd-666 branch February 8, 2020 00:23
@SethTisue SethTisue changed the title fix our Windows Jenkins job (sbt 1.3 upgrade broke it) [nomerge] fix our Windows Jenkins job (sbt 1.3 upgrade broke it) Feb 8, 2020
SethTisue added a commit to SethTisue/scala that referenced this pull request Feb 8, 2020
fixes scala/scala-dev#666

this is a cherry-pick of scala#8703 from 2.12.x onto 2.13.x
@SethTisue
Copy link
Member Author

I don't have time to do a full 2.12.x -> 2.13.x merge today (I looked but there is at least one PR that doesn't merge cleanly), but I want to get the 2.13.x Window jobs fixed pronto since it's broken for a few weeks now, so I've forwarded-ported it here: #8704

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

internal not resulting in user-visible changes (build changes, tests, internal cleanups)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants