Skip to content
This repository has been archived by the owner on Apr 20, 2024. It is now read-only.

Update scala/sbt/chisel versions, fix CI #127

Merged
merged 3 commits into from
Mar 1, 2023

Conversation

tymcauley
Copy link
Contributor

The current settings in build.sbt cause Chipyard to use Scala 2.12 for this project, even though all the other Chipyard projects were updated to Scala 2.13 in ucb-bar/chipyard#1303.

This should also fix the recent CI regressions.

The previous setup used Scala 2.12 even though Chipyard was trying to
override it to use 2.13.10.

Also sync Chisel minor versions with Chipyard, and update to a recent
sbt version.
This file is breaking the test build, the class it is testing was
removed in df3232f.
@tymcauley
Copy link
Contributor Author

@jerryz123 want me to rebase this onto master?

@tymcauley
Copy link
Contributor Author

@jerryz123 want me to rebase this onto master?

Oh nvm, I thought #126 was already merged.

Copy link
Contributor

@abejgonzalez abejgonzalez left a comment

Choose a reason for hiding this comment

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

LGTM.

@abejgonzalez abejgonzalez merged commit c58458e into ucb-bar:master Mar 1, 2023
@tymcauley tymcauley deleted the use-scala-2.13 branch March 1, 2023 07:08
tymcauley added a commit to tymcauley/chipyard that referenced this pull request Mar 1, 2023
tymcauley added a commit to tymcauley/chipyard that referenced this pull request Mar 1, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants