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.

Sign up for GitHub

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

Build refactoring #76

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+34 −59
Open

Build refactoring #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17886bd
fix: reorganize build back to explicit root project
ethanwu10 Mar 19, 2024
10424f6
fix(renovate): add sonatype snapshots repo to config
ethanwu10 Mar 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .renovaterc.json5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,14 @@
"matchPackageNames": ["edu.berkeley.cs:chiseltest"],
"allowedVersions": "~0.6", // Chisel 3.6 (chipyard chisel)
},
{
// Pull rocket-chip from Sonatype OSS snapshot repos
"matchPackageNames": ["edu.berkeley.cs:rocketchip-3.6.0"],
"registryUrls": [
"https://oss.sonatype.org/content/repositories/snapshots",
"https://s01.oss.sonatype.org/content/repositories/snapshots",
],
},
],
"regexManagers": [
{
Expand Down
85 changes: 26 additions & 59 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,3 @@
// ThisBuild / organization := "edu.berkeley.cs"
// ThisBuild / version := "0.0.1-SNAPSHOT"

// ThisBuild / scalaVersion := "2.13.10"
// ThisBuild / scalacOptions := Seq(
// "-deprecation",
// "-feature",
// "-language:reflectiveCalls",
// "-Xcheckinit",
// "-Xlint",
// )

// Compile / doc / scalacOptions += "-groups"

// val chiselVersion = "3.6.0"

// lazy val root = (project in file("."))
// .settings(
// name := "uciedigital",
// libraryDependencies ++= Seq(
// "edu.berkeley.cs" %% "chisel3" % chiselVersion,
// "edu.berkeley.cs" %% "chiseltest" % "0.6.2" % Test,
// "org.scalatest" %% "scalatest" % "3.2.17" % Test,
// "edu.berkeley.cs" %% "rocketchip" % "1.6.0",
// "edu.berkeley.cs" %% "rocket-macros" % "1.6.0",
// "edu.berkeley.cs" %% "cde" % "1.6.0",
// ),
// addCompilerPlugin(
// "edu.berkeley.cs" % "chisel3-plugin" % chiselVersion cross CrossVersion.full,
// ),
// )

// // Plugins
// Global / excludeLintKeys += idePackagePrefix
// root / idePackagePrefix := Some("edu.berkeley.cs.ucie.digital")

name := "ucie_digital"
ThisBuild / organization := "edu.berkeley.cs"
ThisBuild / version := "0.0.1-SNAPSHOT"

Expand All @@ -51,28 +14,32 @@ Compile / doc / scalacOptions += "-groups"

val chiselVersion = "3.6.0"

// SNAPSHOT repositories
libraryDependencies ++=
Seq(
"edu.berkeley.cs" %% "rocketchip-3.6.0" % "1.6-3.6.0-e3773366a-SNAPSHOT",
"edu.berkeley.cs" %% "chisel3" % chiselVersion,
"edu.berkeley.cs" %% "chiseltest" % "0.6.2" % "test",
"org.scalatest" %% "scalatest" % "3.2.18" % "test",
)

resolvers ++= Resolver.sonatypeOssRepos("snapshots")
resolvers ++= Resolver.sonatypeOssRepos("releases")
resolvers += Resolver.mavenLocal

addCompilerPlugin("edu.berkeley.cs" % "chisel3-plugin" % chiselVersion cross CrossVersion.full)

import Tests._

Test / fork := true
Test / testGrouping := (Test / testGrouping).value.flatMap { group =>
group.tests.map { test =>
Group(test.name, Seq(test), SubProcess(ForkOptions()))
}
}
lazy val root = (project in file("."))
.settings(
name := "uciedigital",
idePackagePrefix := Some("edu.berkeley.cs.ucie.digital"),
libraryDependencies ++=
Seq(
"edu.berkeley.cs" %% "chisel3" % chiselVersion,
"edu.berkeley.cs" %% "chiseltest" % "0.6.2" % Test,
"org.scalatest" %% "scalatest" % "3.2.18" % Test,
// from Sonatype OSS Snapshot repos
"edu.berkeley.cs" %% "rocketchip-3.6.0" % "1.6-3.6.0-e3773366a-SNAPSHOT",
),
addCompilerPlugin(
"edu.berkeley.cs" % "chisel3-plugin" % chiselVersion cross CrossVersion.full,
),
Test / fork := true,
Test / testGrouping := (Test / testGrouping).value.flatMap { group =>
import Tests._
group.tests.map { test =>
Group(test.name, Seq(test), SubProcess(ForkOptions()))
}
},
concurrentRestrictions := Seq(Tags.limit(Tags.ForkedTestGroup, 72)),
)

concurrentRestrictions := Seq(Tags.limit(Tags.ForkedTestGroup, 72))
// Plugins
Global / excludeLintKeys += idePackagePrefix