Skip to content

Commit 87dd96b

Browse files
committed
Merge remote-tracking branch 'private/master' into gpl-new-regions
2 parents 1e44687 + f091c6e commit 87dd96b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+6095
-604
lines changed

.gitignore

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,7 @@ obj-x86_64-linux-gnu/
5757

5858
user.bazelrc
5959

60-
bazel-bin
61-
bazel-out
62-
bazel-testlogs
63-
bazel-OpenROAD
60+
bazel-*
6461

6562
projectview.bazelproject
6663
.bsp/

MODULE.bazel

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ bazel_dep(name = "googletest", version = "1.17.0", dev_dependency = True)
109109
# BCR, they should depend on their own version.
110110
bazel_dep(name = "glpk", version = "5.0.bcr.3", repo_name = "org_gnu_glpk")
111111

112-
## Fix the compiler version and avoid any local compiler
112+
## Lock the compiler version and avoid any local compiler
113113
bazel_dep(name = "toolchains_llvm", version = "1.5.0")
114114

115115
# Configure and register the toolchain.
@@ -153,7 +153,7 @@ bazel_dep(name = "bazel-orfs")
153153
# To bump version, run: bazelisk run @bazel-orfs//:bump
154154
git_override(
155155
module_name = "bazel-orfs",
156-
commit = "2aa6a9dd3c0006c5358e363fcac9e209c4dccc47",
156+
commit = "677ecf4bb7195903bb58beae171d254dac984e27",
157157
remote = "https://github.com/The-OpenROAD-Project/bazel-orfs.git",
158158
)
159159

@@ -162,10 +162,10 @@ orfs = use_extension("@bazel-orfs//:extension.bzl", "orfs_repositories")
162162
# To bump version, run: bazelisk run @bazel-orfs//:bump
163163
orfs.default(
164164
# Official image https://hub.docker.com/r/openroad/orfs/tags
165-
image = "docker.io/openroad/orfs:v3.0-4022-ged05b57b7",
165+
image = "docker.io/openroad/orfs:v3.0-4048-g3e652e573",
166166
# Use OpenROAD of this repo instead of from the docker image
167167
openroad = "//:openroad",
168-
sha256 = "57ee6a9d8b9d9a3d1c452e3444ac4da7102c060cfb003eea9468ee368499caec",
168+
sha256 = "1950de791a90b9cf62e7a04a9a9650c4a4eb8e342f7620c10917999040be28ee",
169169
)
170170
use_repo(orfs, "com_github_nixos_patchelf_download")
171171
use_repo(orfs, "docker_orfs")
@@ -195,9 +195,9 @@ maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
195195
maven.install(
196196
name = "maven",
197197
artifacts = [
198-
"org.chipsalliance:chisel_2.13:7.0.0",
199-
"org.chipsalliance:chisel-plugin_2.13.16:7.0.0",
200198
],
199+
# Update by running: bazelisk run @maven//:pin
200+
lock_file = "//bazel:maven_install.json",
201201
repositories = [
202202
"https://repo1.maven.org/maven2",
203203
"https://s01.oss.sonatype.org/content/repositories/releases",

MODULE.bazel.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)