Skip to content

Commit 6b465bd

Browse files
committed
review changes (including remove shasum from ci_build_test in cmake_external)
1 parent db52451 commit 6b465bd

File tree

5 files changed

+4
-15
lines changed

5 files changed

+4
-15
lines changed

drake_bazel_external/.bazelignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
# Used for setup, do not build
21
drake
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
# Used for setup, do not build
21
drake

drake_bazel_external_legacy/.github/ci_build_test

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ set -euxo pipefail
77
# rather than the URL to the latest Drake master branch
88
# found in drake_bazel_external_legacy/WORKSPACE.
99
export EXAMPLES_LOCAL_DRAKE_PATH=$(realpath drake)
10-
trap 'unset EXAMPLES_LOCAL_DRAKE_PATH' EXIT
1110

1211
bazel version
1312
bazel test //...

drake_cmake_external/.github/ci_build_test

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,14 @@ pushd build
2929

3030
export LD_LIBRARY_PATH="${PWD}/install/lib${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}"
3131

32-
cmake_args=()
32+
cmake_commit_arg=
3333
if [[ ! -z "${drake_commit_hash}" ]]; then
3434
# Use a specific commit of Drake source,
3535
# rather than the latest from master.
36-
cmake_args+=(-DDRAKE_COMMIT_HASH=${drake_commit_hash})
37-
38-
# Find the SHA-256 by downloading and running shasum.
39-
wget -O drake.tar.gz \
40-
https://github.com/RobotLocomotion/drake/archive/${drake_commit_hash}.tar.gz
41-
trap 'rm -f drake.tar.gz' EXIT
42-
drake_commit_sha256=$(echo $(shasum -a 256 drake.tar.gz | awk '{print $1}'))
43-
cmake_args+=(-DDRAKE_COMMIT_SHA256=${drake_commit_sha256})
36+
cmake_commit_arg="-DDRAKE_COMMIT_HASH=${drake_commit_hash}"
4437
fi
4538

46-
cmake .. "${cmake_args[@]}"
39+
cmake .. "${cmake_commit_arg}"
4740
cmake --build .
4841

4942
cd drake_external_examples

drake_cmake_external/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,7 @@ ExternalProject_Add(spdlog
9494
set(DRAKE_PREFIX "${PROJECT_BINARY_DIR}/drake-prefix")
9595

9696
# Options to override Drake's latest source on master with a specific commit.
97-
# Download https://github.com/RobotLocomotion/drake/archive/${DRAKE_COMMIT_HASH}.tar.gz
98-
# and use "shasum -a 256 'xxx.tar.gz'" on it to get the DRAKE_COMMIT_SHA256.
97+
# See README.md for details.
9998
set(DRAKE_COMMIT_HASH "master" CACHE STRING "Commit hash for Drake")
10099
set(DRAKE_COMMIT_SHA256 CACHE STRING "SHA256 hash value for Drake commit archive")
101100

0 commit comments

Comments
 (0)