Skip to content

Commit 351e216

Browse files
committed
Merge branch 'master' into cts_improve_level_creating_threshold
2 parents 0d65c03 + c88e270 commit 351e216

49 files changed

Lines changed: 1928 additions & 897 deletions

Some content is hidden

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

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.6.0
1+
9.1.1

.github/workflows/buildifier.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
- name: Cache buildifier
3636
id: cache-buildifier
37-
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
37+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
3838
with:
3939
path: ./buildifier
4040
key: ${{ runner.os }}-buildifier-${{ env.BUILDIFIER_VERSION }}

.github/workflows/first-time-contributor.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@ jobs:
1414
pull-requests: write
1515
steps:
1616
- name: Greet First-Time Contributor
17-
uses: actions/first-interaction@34f15e814fe48ac9312ccf29db4e74fa767cbab7 # v1.3.0
17+
uses: actions/first-interaction@1c4688942c71f71d4f5502a26ea67c331730fa4d # v3.1.0
1818
with:
19-
repo-token: ${{ secrets.GITHUB_TOKEN }}
20-
issue-message: |
19+
repo_token: ${{ secrets.GITHUB_TOKEN }}
20+
issue_message: |
2121
Welcome to OpenROAD! Thanks for opening your first issue.
2222
To get started:
2323
- Build Instructions: https://openroad.readthedocs.io/en/latest/contrib/BuildWithCMake.html
2424
- Contribution Guide: https://openroad.readthedocs.io/en/latest/contrib/contributing.html
2525
2626
Please search existing issues before submitting to avoid duplicates.
2727
A maintainer will get back to you soon!
28-
pr-message: |
28+
pr_message: |
2929
Welcome to OpenROAD! Thanks for opening your first PR.
3030
Before we review:
3131
- Contribution Guide: https://openroad.readthedocs.io/en/latest/contrib/contributing.html

.github/workflows/github-actions-on-master-push.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
3030
- name: Cache buildifier
3131
id: cache-buildifier
32-
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
32+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
3333
with:
3434
path: ./buildifier
3535
key: ${{ runner.os }}-buildifier-${{ env.BUILDIFIER_VERSION }}

.github/workflows/github-actions-update-grammar-railroad-diagrams.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ jobs:
2020
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2121

2222
- name: Set up Java
23-
uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4.8.0
23+
uses: actions/setup-java@0f481fcb613427c0f801b606911222b5b6f3083a # v5.5.0
2424
with:
2525
distribution: temurin
2626
java-version: "21"
2727

2828
- name: Cache railroad diagram tools
29-
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
29+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
3030
id: cache-tools
3131
with:
3232
path: src/odb/doc/tools
@@ -82,7 +82,7 @@ jobs:
8282
8383
- name: Open PR if diagrams changed
8484
if: steps.diagram-changes.outputs.changed == 'true'
85-
uses: peter-evans/create-pull-request@22a9089034f40e5a961c8808d113e2c98fb63676 # v7.0.11
85+
uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8.1.1
8686
with:
8787
commit-message: "odb: regenerate LEF/DEF railroad diagram SVGs"
8888
branch: auto/grammar-railroad-diagrams

CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,10 @@ set(CMAKE_CXX_EXTENSIONS OFF)
7575

7676
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
7777

78-
set_property(DIRECTORY PROPERTY TEST_DISCOVERY_TIMEOUT 60)
78+
# Defer GoogleTest case discovery from build time (POST_BUILD default, which
79+
# execs each test binary during the build) to ctest time. On a loaded CI host
80+
# the build-time discovery run can exceed the timeout and fail the whole build.
81+
set(CMAKE_GTEST_DISCOVER_TESTS_DISCOVERY_MODE PRE_TEST)
7982

8083
# Get version string in OPENROAD_VERSION
8184
if(NOT OPENROAD_VERSION)

MODULE.bazel

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@ bazel_dep(name = "platforms", version = "1.0.0")
2828
bazel_dep(name = "rules_bison", version = "0.3.1")
2929
bazel_dep(name = "rules_cc", version = "0.2.18")
3030
bazel_dep(name = "rules_flex", version = "0.3.1")
31+
32+
# rules_go is transitive (or-tools, gazelle, grpc-java, rules_buf). The
33+
# MVS-selected 0.53.0 references the top-level CcInfo global that Bazel 9
34+
# removed (go/private/rules/cgo.bzl), breaking analysis. 0.59.0+ loads
35+
# CcInfo from @rules_cc; force a Bazel-9-compatible release.
36+
bazel_dep(name = "rules_go", version = "0.61.1")
3137
bazel_dep(name = "rules_pkg", version = "1.2.0")
3238
bazel_dep(name = "rules_pycross", version = "0.8.1")
3339
bazel_dep(name = "rules_python", version = "1.8.5")
@@ -104,6 +110,14 @@ bazel_dep(name = "cudd", version = "3.0.0.bcr.2")
104110
bazel_dep(name = "eigen", version = "3.4.0.bcr.3")
105111
bazel_dep(name = "fmt", version = "11.2.0.bcr.1")
106112

113+
# freetype reaches the build transitively (qt-bazel -> harfbuzz -> freetype).
114+
# freetype@2.13.3's BUILD overlay calls the native cc_library rule, which
115+
# Bazel 9 removed, so loading the package fails. 2.13.3.bcr.2 keeps the same
116+
# 2.13.3 source but its overlay loads cc_library from @rules_cc. This is a
117+
# direct bazel_dep rather than a single_version_override so the pin propagates
118+
# to downstream consumers via MVS (overrides only apply in the root module).
119+
bazel_dep(name = "freetype", version = "2.13.3.bcr.2")
120+
107121
# gawk is transitive (abc -> ncurses -> gawk; yosys -> gawk). Same gnulib
108122
# libc-header shadowing as sed: gawk@5.3.2.bcr.2 fails to compile against
109123
# hermetic-llvm's explicit libc -isystem entries (BCR #7642). 5.3.2.bcr.7
@@ -135,7 +149,10 @@ single_version_override(
135149
version = "4.9.bcr.5",
136150
)
137151

138-
bazel_dep(name = "spdlog", version = "1.15.1")
152+
# spdlog < 1.16.0.bcr.2's BUILD.bazel calls the native cc_test rule, which
153+
# Bazel 9 removed; loading the package fails. 1.16.0.bcr.2+ loads cc_test
154+
# from @rules_cc.
155+
bazel_dep(name = "spdlog", version = "1.17.0")
139156
bazel_dep(name = "sv-lang", version = "10.0.1-20260316-f04e8156")
140157
bazel_dep(name = "tcl_lang", version = "9.0.2.bcr.1")
141158

@@ -192,7 +209,7 @@ bazel_dep(name = "rules_nodejs", version = "6.7.3", dev_dependency = True)
192209
bazel_dep(name = "bazel-orfs", dev_dependency = True)
193210
bazel_dep(name = "bazel-orfs-verilog", dev_dependency = True)
194211

195-
BAZEL_ORFS_COMMIT = "60d62021c779e64ef7360a1b08a8faee00183c8d"
212+
BAZEL_ORFS_COMMIT = "551d4c72749411c4b1168c0d12322a9c34817c91"
196213

197214
BAZEL_ORFS_REMOTE = "https://github.com/The-OpenROAD-Project/bazel-orfs.git"
198215

@@ -380,9 +397,12 @@ single_version_override(
380397

381398
# scip 9.2.3's tinycthread uses bare C11 <threads.h> names. Backport
382399
# scipopt/scip@cc917e07 (TNY_ prefix) until a fixed release lands in BCR.
400+
# The .bcr.1 revision keeps the 9.2.3 source (patch still applies) but its
401+
# overlay BUILD loads cc_library/cc_binary from @rules_cc rather than the
402+
# native rules Bazel 9 removed.
383403
single_version_override(
384404
module_name = "scip",
385405
patch_strip = 1,
386406
patches = ["//bazel:scip_tinycthread_tny_prefix.patch"],
387-
version = "9.2.3",
407+
version = "9.2.3.bcr.1",
388408
)

0 commit comments

Comments
 (0)