Skip to content

Commit 05af3af

Browse files
committed
Merge remote-tracking branch 'origin/master' into gpl_remove_filler_removal_cap
2 parents 6d12000 + cafb53b commit 05af3af

676 files changed

Lines changed: 164014 additions & 109852 deletions

File tree

Some content is hidden

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

.clang-tidy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Checks: >
88
-clang-analyzer-cplusplus.NewDeleteLeaks,
99
-clang-analyzer-optin.performance.Padding,
1010
readability-*,
11-
-readability-identifier-naming
11+
-readability-identifier-naming,
1212
-readability-braces-around-statements,
1313
-readability-convert-member-functions-to-static,
1414
-readability-function-cognitive-complexity,

.github/dependabot.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,3 @@ updates:
44
directory: "/"
55
schedule:
66
interval: "daily"
7-
- package-ecosystem: "gitsubmodule"
8-
directory: "/"
9-
schedule:
10-
interval: "daily"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ jobs:
1717
uses: The-OpenROAD-Project/clang-tidy-review@master
1818
id: review
1919
with:
20+
clang_tidy_version: 19
2021
build_dir: "./build"
2122
cmake_command: cmake . -B build
2223
config_file: ".clang-tidy"

BUILD.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ config_setting(
4949

5050
OPENROAD_LIBRARY_DEPS = [
5151
":openroad_version",
52-
":ord",
5352
"//src/ant",
5453
"//src/ant:ui",
5554
"//src/cgt",
@@ -106,6 +105,7 @@ OPENROAD_LIBRARY_DEPS = [
106105
"//src/utl",
107106
"//src/utl:ui",
108107
"@edu_berkeley_abc//:abc-lib",
108+
":ord",
109109
] + select(
110110
{
111111
":platform_cli": ["//src/gui"],
@@ -187,11 +187,11 @@ cc_library(
187187
"include",
188188
],
189189
visibility = ["//visibility:public"],
190-
deps = OPENROAD_LIBRARY_DEPS + [
190+
deps = [
191191
"//src/sta:opensta_lib",
192192
"@boost.stacktrace",
193193
"@tk_tcl//:tcl",
194-
],
194+
] + OPENROAD_LIBRARY_DEPS,
195195
)
196196

197197
cc_library(

Jenkinsfile

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -217,28 +217,33 @@ def bazelTest = {
217217
checkout scm;
218218
sh label: 'Setup Docker Image', script: 'docker build -f docker/Dockerfile.bazel -t openroad/bazel-ci .';
219219
}
220-
withDockerContainer(args: '-u root -v /var/run/docker.sock:/var/run/docker.sock', image: 'openroad/bazel-ci:latest') {
221-
stage('bazelisk test ...') {
222-
withCredentials([string(credentialsId: 'bazel-auth-token-b64', variable: 'BAZEL_AUTH_TOKEN_B64')]) {
223-
timeout(time: 120, unit: 'MINUTES') {
224-
def cmd = 'bazelisk test --config=ci --show_timestamps --test_output=errors --curses=no --force_pic --remote_header="Authorization=Basic $BAZEL_AUTH_TOKEN_B64" --profile=build.profile'
225-
try {
226-
try {
227-
sh label: 'Test, using cached results and building a minimum of dependencies', script: cmd + ' ...';
228-
} finally {
229-
sh label: 'Analyze build times', script: 'bazelisk analyze-profile build.profile';
230-
}
231-
} catch (e) {
232-
currentBuild.result = 'FAILURE';
220+
try {
221+
withDockerContainer(args: '-u root -v /var/run/docker.sock:/var/run/docker.sock', image: 'openroad/bazel-ci:latest') {
222+
stage('bazelisk test ...') {
223+
withCredentials([string(credentialsId: 'bazel-auth-token-b64', variable: 'BAZEL_AUTH_TOKEN_B64')]) {
224+
timeout(time: 120, unit: 'MINUTES') {
225+
def cmd = 'bazelisk test --config=ci --show_timestamps --test_output=errors --curses=no --force_pic --remote_header="Authorization=Basic $BAZEL_AUTH_TOKEN_B64" --profile=build.profile'
233226
try {
234-
sh label: 'Test (keep_going)', script: cmd + ' --keep_going ...';
235-
} finally {
236-
sh label: 'Analyze build times', script: 'bazelisk analyze-profile build.profile';
227+
try {
228+
sh label: 'Test, using cached results and building a minimum of dependencies', script: cmd + ' ...';
229+
} finally {
230+
sh label: 'Analyze build times', script: 'bazelisk analyze-profile build.profile';
231+
}
232+
} catch (e) {
233+
try {
234+
sh label: 'Test (keep_going)', script: cmd + ' --keep_going ...';
235+
} catch (e2) {
236+
currentBuild.result = 'FAILURE';
237+
} finally {
238+
sh label: 'Analyze build times', script: 'bazelisk analyze-profile build.profile';
239+
}
237240
}
238241
}
239242
}
240243
}
241244
}
245+
} catch (IOException e) {
246+
echo "Caught: ${e}";
242247
}
243248
}
244249
}

MODULE.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -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 = "da01065203fbcc043c82318b544fbe111053b9d0",
156+
commit = "2aa6a9dd3c0006c5358e363fcac9e209c4dccc47",
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-3872-g66e441c6c",
165+
image = "docker.io/openroad/orfs:v3.0-3998-gb31abb52d",
166166
# Use OpenROAD of this repo instead of from the docker image
167167
openroad = "//:openroad",
168-
sha256 = "f75321f10023a8bf99b1ed5dfe1dab6351f588eda24f186a66e9145fd9b76fd1",
168+
sha256 = "dc40b4a466dcc394b542f2189422ca1c5480c223926fd7a6844211e23a129117",
169169
)
170170
use_repo(orfs, "com_github_nixos_patchelf_download")
171171
use_repo(orfs, "docker_orfs")

0 commit comments

Comments
 (0)