Skip to content

Commit d429317

Browse files
arthurjoloarthurjolo
committed
merge master and fix conflicts
Signed-off-by: arthurjolo <[email protected]>
2 parents e1d811e + 74dbef2 commit d429317

File tree

564 files changed

+5297
-4704
lines changed

Some content is hidden

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

564 files changed

+5297
-4704
lines changed

‎.buildifier.json‎

Lines changed: 1 addition & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -2,103 +2,5 @@
22
"type": "auto",
33
"mode": "fix",
44
"lint": "fix",
5-
"warningsList": [
6-
"attr-applicable_licenses",
7-
"attr-cfg",
8-
"attr-license",
9-
"attr-licenses",
10-
"attr-non-empty",
11-
"attr-output-default",
12-
"attr-single-file",
13-
"build-args-kwargs",
14-
"bzl-visibility",
15-
"confusing-name",
16-
"constant-glob",
17-
"ctx-actions",
18-
"ctx-args",
19-
"deprecated-function",
20-
"depset-items",
21-
"depset-iteration",
22-
"depset-union",
23-
"dict-concatenation",
24-
"dict-method-named-arg",
25-
"duplicated-name",
26-
"filetype",
27-
"function-docstring",
28-
"function-docstring-args",
29-
"function-docstring-header",
30-
"function-docstring-return",
31-
"git-repository",
32-
"http-archive",
33-
"integer-division",
34-
"keyword-positional-params",
35-
"list-append",
36-
"load",
37-
"module-docstring",
38-
"name-conventions",
39-
"native-android",
40-
"native-build",
41-
"native-cc-binary",
42-
"native-cc-common",
43-
"native-cc-debug-package-info",
44-
"native-cc-fdo-prefetch-hints",
45-
"native-cc-fdo-profile",
46-
"native-cc-import",
47-
"native-cc-info",
48-
"native-cc-library",
49-
"native-cc-memprof-profile",
50-
"native-cc-objc-import",
51-
"native-cc-objc-library",
52-
"native-cc-propeller-optimize",
53-
"native-cc-proto",
54-
"native-cc-shared-library",
55-
"native-cc-shared-library-hint-info",
56-
"native-cc-shared-library-info",
57-
"native-cc-test",
58-
"native-cc-toolchain",
59-
"native-cc-toolchain-suite",
60-
"native-java-binary",
61-
"native-java-common",
62-
"native-java-import",
63-
"native-java-info",
64-
"native-java-library",
65-
"native-java-lite-proto",
66-
"native-java-package-config",
67-
"native-java-plugin",
68-
"native-java-plugin-info",
69-
"native-java-proto",
70-
"native-java-runtime",
71-
"native-java-test",
72-
"native-java-toolchain",
73-
"native-package",
74-
"native-proto",
75-
"native-proto-common",
76-
"native-proto-info",
77-
"native-proto-lang-toolchain",
78-
"native-proto-lang-toolchain-info",
79-
"native-py",
80-
"native-sh-binary",
81-
"native-sh-library",
82-
"native-sh-test",
83-
"no-effect",
84-
"output-group",
85-
"overly-nested-depset",
86-
"package-name",
87-
"package-on-top",
88-
"positional-args",
89-
"print",
90-
"provider-params",
91-
"redefined-variable",
92-
"repository-name",
93-
"return-value",
94-
"rule-impl-return",
95-
"skylark-comment",
96-
"skylark-docstring",
97-
"string-iteration",
98-
"uninitialized",
99-
"unnamed-macro",
100-
"unreachable",
101-
"unsorted-dict-items",
102-
"unused-variable"
103-
]
5+
"warnings": "all"
1046
}

‎.github/dependabot.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: "daily"
7+
- package-ecosystem: "gitsubmodule"
8+
directory: "/"
9+
schedule:
10+
interval: "daily"

‎.github/workflows/bazel-format-lint.yaml‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎.github/workflows/buildifier.yaml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: Lint Bazel
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
8+
branches:
9+
- master
10+
11+
jobs:
12+
buildifier:
13+
runs-on: ${{ vars.USE_SELF_HOSTED == 'true' && 'self-hosted' || 'ubuntu-latest' }}
14+
strategy:
15+
fail-fast: false
16+
matrix:
17+
check:
18+
- name: Buildifier format
19+
run: ./buildifier -r -mode=check -lint=off .
20+
- name: Buildifier lint
21+
run: ./buildifier -r -lint=warn .
22+
name: ${{ matrix.check.name }}
23+
env:
24+
BUILDIFIER_VERSION: v8.2.1
25+
26+
steps:
27+
- name: Checkout Code
28+
uses: actions/checkout@v5
29+
30+
- name: Cache buildifier
31+
id: cache-buildifier
32+
uses: actions/cache@v4
33+
with:
34+
path: ./buildifier
35+
key: ${{ runner.os }}-buildifier-${{ env.BUILDIFIER_VERSION }}
36+
37+
- name: Download buildifier
38+
if: steps.cache-buildifier.outputs.cache-hit != 'true'
39+
run: |
40+
wget https://github.com/bazelbuild/buildtools/releases/download/${BUILDIFIER_VERSION}/buildifier-linux-amd64 -O buildifier
41+
chmod +x buildifier
42+
43+
- name: ${{ matrix.check.name }}
44+
run: ${{ matrix.check.run }}

‎.github/workflows/github-actions-clang-tidy.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,26 @@ name: clang-tidy-review
33
on:
44
pull_request:
55
branches:
6-
- master
6+
- master
77

88
jobs:
99
Clang-Tidy:
1010
runs-on: ${{ vars.USE_SELF_HOSTED == 'true' && 'self-hosted' || 'ubuntu-latest' }}
1111
steps:
1212
- name: Checkout repository
13-
uses: actions/checkout@v4
13+
uses: actions/checkout@v5
1414
with:
15-
submodules: 'recursive'
15+
submodules: "recursive"
1616
- name: ClangTidy Gen
1717
uses: The-OpenROAD-Project/clang-tidy-review@master
1818
id: review
1919
with:
20-
build_dir: './build'
20+
build_dir: "./build"
2121
cmake_command: cmake . -B build
22-
config_file: '.clang-tidy'
22+
config_file: ".clang-tidy"
2323
exclude: "*/codeGenerator/templates/*,*/third-party/*"
2424
split_workflow: true
25-
apt_packages: libomp-15-dev,libfl-dev
25+
apt_packages: libomp-15-dev,libfl-dev,libyaml-cpp-dev
2626
- uses: The-OpenROAD-Project/clang-tidy-review/upload@master
2727
id: upload-review
2828
- name: Correct Build Directory Ownership

‎.scalafmt.conf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
version = "3.7.15"
2+
runner.dialect = scala213

‎BUILD.bazel‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
# Copyright (c) 2025-2025, The OpenROAD Authors
33

44
load("@bazel_skylib//rules:common_settings.bzl", "string_flag")
5+
load("@openroad_rules_python//python:defs.bzl", "py_library")
6+
load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
7+
load("@rules_cc//cc:cc_library.bzl", "cc_library")
58
load("//bazel:python_wrap_cc.bzl", "PYTHON_STABLE_API_DEFINE", "python_wrap_cc")
69
load("//bazel:tcl_encode_or.bzl", "tcl_encode")
710
load("//bazel:tcl_wrap_cc.bzl", "tcl_wrap_cc")
@@ -104,8 +107,8 @@ OPENROAD_LIBRARY_DEPS = [
104107
"@edu_berkeley_abc//:abc-lib",
105108
] + select(
106109
{
107-
":platform_gui": ["//src/gui:gui_qt"],
108110
":platform_cli": ["//src/gui"],
111+
":platform_gui": ["//src/gui:gui_qt"],
109112
},
110113
)
111114

@@ -161,8 +164,8 @@ cc_binary(
161164

162165
GUI_BUILD_FLAGS = select(
163166
{
164-
":platform_gui": ["BUILD_GUI=true"],
165167
":platform_cli": ["BUILD_GUI=false"],
168+
":platform_gui": ["BUILD_GUI=true"],
166169
},
167170
)
168171

‎MODULE.bazel‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ bazel_dep(name = "bazel-orfs")
154154
# To bump version, run: bazelisk run @bazel-orfs//:bump
155155
git_override(
156156
module_name = "bazel-orfs",
157-
commit = "264aef66bf3adebe19ea7d18dabdc24b9733c8c2",
157+
commit = "da01065203fbcc043c82318b544fbe111053b9d0",
158158
remote = "https://github.com/The-OpenROAD-Project/bazel-orfs.git",
159159
)
160160

@@ -163,18 +163,16 @@ orfs = use_extension("@bazel-orfs//:extension.bzl", "orfs_repositories")
163163
# To bump version, run: bazelisk run @bazel-orfs//:bump
164164
orfs.default(
165165
# Official image https://hub.docker.com/r/openroad/orfs/tags
166-
image = "docker.io/openroad/orfs:v3.0-3845-gbefd38218",
166+
image = "docker.io/openroad/orfs:v3.0-3872-g66e441c6c",
167167
# Use OpenROAD of this repo instead of from the docker image
168168
openroad = "//:openroad",
169-
sha256 = "4982a5b87588e4699f11deaed3286cba8b65d144e439c6f5845656abebfc0971",
169+
sha256 = "f75321f10023a8bf99b1ed5dfe1dab6351f588eda24f186a66e9145fd9b76fd1",
170170
)
171171
use_repo(orfs, "com_github_nixos_patchelf_download")
172172
use_repo(orfs, "docker_orfs")
173173

174174
SCALA_VERSION = "2.13.16"
175175

176-
SCALA_VERSION_SHORT = SCALA_VERSION.rpartition(".")[0]
177-
178176
scala_config = use_extension(
179177
"@rules_scala//scala/extensions:config.bzl",
180178
"scala_config",

‎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.

‎WORKSPACE‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ workspace(name = "openroad")
88

99
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
1010

11-
rules_hdl_git_hash = "cf2bd95334741db74b39b47fa1d4622b0d45ce6c"
11+
rules_hdl_git_hash = "8cc8977cc305ed94ec7852495ed576fcbde1c18d"
1212

13-
rules_hdl_git_sha256 = "137e1fbde970a41f295ca348f9105bc7eedd6640374ec7f4a8abaee9a2cfc2d0"
13+
rules_hdl_git_sha256 = "046193f4a0b006f43bd5f9615c218d2171d0169e231028a22d8d9c011c675ad6"
1414

1515
http_archive(
1616
name = "rules_hdl",

0 commit comments

Comments
 (0)