From 865d4911824fa8675953b39b70767135da863390 Mon Sep 17 00:00:00 2001 From: Takayuki AKAMINE Date: Thu, 21 Sep 2023 15:01:13 +0900 Subject: [PATCH 1/3] fix: add cyclonedds to release script. Signed-off-by: Takayuki AKAMINE --- release_script/release_caret.sh | 9 +++++++++ release_script/template_caret.repos | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/release_script/release_caret.sh b/release_script/release_caret.sh index 0b1e08c5..9e47c594 100755 --- a/release_script/release_caret.sh +++ b/release_script/release_caret.sh @@ -46,6 +46,9 @@ ROS_TRACING_REPOS="ros2_tracing" ROS_RCLCPP_REPOS="rclcpp" ROS_RCL_REPOS="rcl" +# cyclonedds +CYCLONEDDS_REPOS="cyclonedds" + # variables DRY_RUN= TAG_ID= @@ -133,6 +136,10 @@ ROS_RCLCPP_HASH=$(get_hash_from_repository "${ROOT_DIR}"/${ROS_RCLCPP_PATH}) ROS_RCL_PATH="src/ros2/${ROS_RCL_REPOS}" ROS_RCL_HASH=$(get_hash_from_repository "${ROOT_DIR}"/${ROS_RCL_PATH}) +# get hash number from cyclonedds +CYCLONEDDS_PATH="src/eclipse-cyclonedds/${CYCLONEDDS_REPOS}" +CYCLONEDDS_HASH=$(get_hash_from_repository "${ROOT_DIR}"/${CYCLONEDDS_REPOS}) + # checkout caret repository. ${DRY_RUN} git checkout -b rc/"${TAG_ID}" @@ -141,8 +148,10 @@ ${DRY_RUN} cp "${SCRIPT_DIR}"/template_caret.repos "${ROOT_DIR}"/caret.repos ${DRY_RUN} sed -i -e "s/ROS_TRACING_HASH/${ROS_TRACING_HASH}/g" "${ROOT_DIR}"/caret.repos ${DRY_RUN} sed -i -e "s/RCLCPP_HASH/${ROS_RCLCPP_HASH}/g" "${ROOT_DIR}"/caret.repos ${DRY_RUN} sed -i -e "s/RCL_HASH/${ROS_RCL_HASH}/g" "${ROOT_DIR}"/caret.repos +${DRY_RUN} sed -i -e "s/CYCLONEDDS_HASH/${CYCLONEDDS_HASH}/g" "${ROOT_DIR}"/caret.repos ${DRY_RUN} sed -i -e "s/CARET_TAG/${TAG_ID}/g" "${ROOT_DIR}"/caret.repos + ${DRY_RUN} git add "${ROOT_DIR}"/caret.repos ${DRY_RUN} git commit -m "release(caret.repos): change version of sub repositories for ${TAG_ID}" diff --git a/release_script/template_caret.repos b/release_script/template_caret.repos index a0e91cce..d6d92ba9 100644 --- a/release_script/template_caret.repos +++ b/release_script/template_caret.repos @@ -31,3 +31,7 @@ repositories: type: git url: https://github.com/tier4/caret_common.git version: CARET_TAG + eclipse-cyclonedds/cyclonedds: + type: git + url: https://github.com/eclipse-cyclonedds/cyclonedds.git + version: CYCLONEDDS_HASH \ No newline at end of file From 8df5333f3e6492e83c2a100ed99dfc4ca6ab4e2a Mon Sep 17 00:00:00 2001 From: Takayuki AKAMINE Date: Thu, 21 Sep 2023 15:17:19 +0900 Subject: [PATCH 2/3] fix: fix wrong path Signed-off-by: Takayuki AKAMINE --- release_script/release_caret.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release_script/release_caret.sh b/release_script/release_caret.sh index 9e47c594..9afe7e34 100755 --- a/release_script/release_caret.sh +++ b/release_script/release_caret.sh @@ -138,7 +138,7 @@ ROS_RCL_HASH=$(get_hash_from_repository "${ROOT_DIR}"/${ROS_RCL_PATH}) # get hash number from cyclonedds CYCLONEDDS_PATH="src/eclipse-cyclonedds/${CYCLONEDDS_REPOS}" -CYCLONEDDS_HASH=$(get_hash_from_repository "${ROOT_DIR}"/${CYCLONEDDS_REPOS}) +CYCLONEDDS_HASH=$(get_hash_from_repository "${ROOT_DIR}"/${CYCLONEDDS_PATH}) # checkout caret repository. ${DRY_RUN} git checkout -b rc/"${TAG_ID}" From 491a434cdc559523f985fe2d7ddae1c29c40a660 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 21 Sep 2023 06:21:02 +0000 Subject: [PATCH 3/3] ci(pre-commit): autofix --- release_script/release_caret.sh | 1 - release_script/template_caret.repos | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/release_script/release_caret.sh b/release_script/release_caret.sh index 9afe7e34..e8baaa07 100755 --- a/release_script/release_caret.sh +++ b/release_script/release_caret.sh @@ -151,7 +151,6 @@ ${DRY_RUN} sed -i -e "s/RCL_HASH/${ROS_RCL_HASH}/g" "${ROOT_DIR}"/caret.repos ${DRY_RUN} sed -i -e "s/CYCLONEDDS_HASH/${CYCLONEDDS_HASH}/g" "${ROOT_DIR}"/caret.repos ${DRY_RUN} sed -i -e "s/CARET_TAG/${TAG_ID}/g" "${ROOT_DIR}"/caret.repos - ${DRY_RUN} git add "${ROOT_DIR}"/caret.repos ${DRY_RUN} git commit -m "release(caret.repos): change version of sub repositories for ${TAG_ID}" diff --git a/release_script/template_caret.repos b/release_script/template_caret.repos index d6d92ba9..27e9400d 100644 --- a/release_script/template_caret.repos +++ b/release_script/template_caret.repos @@ -34,4 +34,4 @@ repositories: eclipse-cyclonedds/cyclonedds: type: git url: https://github.com/eclipse-cyclonedds/cyclonedds.git - version: CYCLONEDDS_HASH \ No newline at end of file + version: CYCLONEDDS_HASH