Skip to content

Commit b5cc6ba

Browse files
committed
Merge branch 'master' of https://github.com/The-OpenROAD-Project-private/OpenROAD into secure-fix-cts-del-modnet
Signed-off-by: Jaehyun Kim <[email protected]>
2 parents 6078623 + 666be19 commit b5cc6ba

File tree

709 files changed

+31014
-15708
lines changed

Some content is hidden

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

709 files changed

+31014
-15708
lines changed

.clang-format

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ BraceWrapping:
2727
BreakBeforeBinaryOperators: All
2828
BreakBeforeBraces: Custom
2929
InsertBraces: true
30+
LineEnding: LF
3031
DerivePointerAlignment: false
3132
SpaceAfterCStyleCast: true
3233
Standard: c++17

Jenkinsfile

Lines changed: 5 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,10 @@ def getParallelTests(String image) {
127127
stage('no-test Build') {
128128
timeout(time: 20, unit: 'MINUTES') {
129129
catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
130-
sh label: 'no-test Build', script: 'cmake -B build_no_tests -D ENABLE_TESTS=OFF 2>&1 | tee no_test.log';
130+
sh label: 'no-test Build', script: './etc/Build.sh -no-warnings -no-tests';
131131
}
132132
}
133+
sh 'mv build/openroad_build.log no_test.log'
133134
archiveArtifacts artifacts: 'no_test.log';
134135
}
135136
}
@@ -176,11 +177,8 @@ def getParallelTests(String image) {
176177
sh label: 'Configure git', script: "git config --system --add safe.directory '*'";
177178
checkout scm;
178179
}
179-
stage('C++ Unit Tests Setup') {
180-
sh label: 'C++ Unit Tests Setup', script: 'cmake -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -GNinja -B build .';
181-
}
182-
stage('C++ Unit Tests') {
183-
sh label: 'C++ Unit Tests', script: 'cd build && CLICOLOR_FORCE=1 ninja build_and_test';
180+
stage('C++ Build and Unit Tests') {
181+
sh label: 'C++ Build with Ninja', script: './etc/Build.sh -no-warnings -ninja';
184182
}
185183
}
186184
}
@@ -203,49 +201,13 @@ def getParallelTests(String image) {
203201
checkout scm;
204202
}
205203
stage('Compile with C++20') {
206-
sh label: 'Compile C++20', script: "./etc/Build.sh -no-warnings -compiler='clang-16' -cmake='-DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_STANDARD=20'";
204+
sh label: 'Compile C++20', script: "./etc/Build.sh -cpp20"
207205
}
208206
}
209207
}
210208
}
211209
];
212210

213-
if (env.BRANCH_NAME == 'master') {
214-
deb_os = [
215-
[name: 'Ubuntu 20.04' , artifact_name: 'ubuntu-20.04', image: 'openroad/ubuntu20.04-dev'],
216-
[name: 'Ubuntu 22.04' , artifact_name: 'ubuntu-22.04', image: 'openroad/ubuntu22.04-dev'],
217-
[name: 'Debian 11' , artifact_name: 'debian11', image: 'openroad/debian11-dev']
218-
];
219-
deb_os.each { os ->
220-
ret["Build .deb - ${os.name}"] = {
221-
node {
222-
stage('Setup and Build') {
223-
sh label: 'Pull latest image', script: "docker pull ${os.image}:latest";
224-
withDockerContainer(args: '-u root', image: "${os.image}") {
225-
sh label: 'Configure git', script: "git config --system --add safe.directory '*'";
226-
checkout([
227-
$class: 'GitSCM',
228-
branches: [[name: scm.branches[0].name]],
229-
doGenerateSubmoduleConfigurations: false,
230-
extensions: [
231-
[$class: 'CloneOption', noTags: false],
232-
[$class: 'SubmoduleOption', recursiveSubmodules: true]
233-
],
234-
submoduleCfg: [],
235-
userRemoteConfigs: scm.userRemoteConfigs
236-
]);
237-
def version = sh(script: 'git describe | sed s,^v,,', returnStdout: true).trim();
238-
sh label: 'Create Changelog', script: "./debian/create-changelog.sh ${version}";
239-
sh label: 'Run debuild', script: 'debuild --preserve-env --preserve-envvar=PATH -B -j$(nproc)';
240-
sh label: 'Move generated files', script: "./debian/move-artifacts.sh ${version} ${os.artifact_name}";
241-
archiveArtifacts artifacts: '*' + "${version}" + '*';
242-
}
243-
}
244-
}
245-
}
246-
}
247-
}
248-
249211
return ret;
250212
}
251213

MODULE.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ bazel_dep(name = "bazel-orfs")
152152
# To bump version, run: bazelisk run @bazel-orfs//:bump
153153
git_override(
154154
module_name = "bazel-orfs",
155-
commit = "a94bc4e8e7973750cf818a220fcb2c1e23042469",
155+
commit = "25aa6f643146394f201eac5ef4df69887c83859f",
156156
remote = "https://github.com/The-OpenROAD-Project/bazel-orfs.git",
157157
)
158158

@@ -161,10 +161,10 @@ orfs = use_extension("@bazel-orfs//:extension.bzl", "orfs_repositories")
161161
# To bump version, run: bazelisk run @bazel-orfs//:bump
162162
orfs.default(
163163
# Official image https://hub.docker.com/r/openroad/orfs/tags
164-
image = "docker.io/openroad/orfs:v3.0-3695-ga037c3d9",
164+
image = "docker.io/openroad/orfs:v3.0-3749-g8443d760",
165165
# Use OpenROAD of this repo instead of from the docker image
166166
openroad = "//:openroad",
167-
sha256 = "a1e32aa02774b817ccb66813bbf838a6b5174ee90bdfc1a42e7e288a2a6dc25f",
167+
sha256 = "f84c76855e854e89e54eb87fac2b65038567205ced5f8051e34e2e842047d78a",
168168
)
169169
use_repo(orfs, "com_github_nixos_patchelf_download")
170170
use_repo(orfs, "docker_orfs")

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.

debian/control

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

debian/copyright

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

debian/create-changelog.sh

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

debian/move-artifacts.sh

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

debian/openroad.install

Lines changed: 0 additions & 1 deletion
This file was deleted.

debian/rules

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

0 commit comments

Comments
 (0)