From 7e68dc8691a21dc0146df97116df1c09572aa5df Mon Sep 17 00:00:00 2001
From: Yutaka Kondo <yutaka.kondo@youtalk.jp>
Date: Tue, 21 Jan 2025 17:40:00 +0900
Subject: [PATCH 1/2] fix(docker): add `set -e` to return shell script's error
 (#5661)

---
 docker/scripts/build_and_clean.sh     | 1 +
 docker/scripts/cleanup_apt.sh         | 1 +
 docker/scripts/cleanup_system.sh      | 1 +
 docker/scripts/resolve_rosdep_keys.sh | 1 +
 4 files changed, 4 insertions(+)

diff --git a/docker/scripts/build_and_clean.sh b/docker/scripts/build_and_clean.sh
index e9d5ec6168..f5f383f156 100755
--- a/docker/scripts/build_and_clean.sh
+++ b/docker/scripts/build_and_clean.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 function build_and_clean() {
     local ccache_dir=$1
diff --git a/docker/scripts/cleanup_apt.sh b/docker/scripts/cleanup_apt.sh
index ad03c1f39e..f3a47e5829 100755
--- a/docker/scripts/cleanup_apt.sh
+++ b/docker/scripts/cleanup_apt.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 function cleanup_apt() {
     local apt_clean=$1
diff --git a/docker/scripts/cleanup_system.sh b/docker/scripts/cleanup_system.sh
index 0833be2b3a..72127927ec 100755
--- a/docker/scripts/cleanup_system.sh
+++ b/docker/scripts/cleanup_system.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 function cleanup_system() {
     local lib_dir=$1
diff --git a/docker/scripts/resolve_rosdep_keys.sh b/docker/scripts/resolve_rosdep_keys.sh
index 9b03b6ab04..1b3f5839bd 100755
--- a/docker/scripts/resolve_rosdep_keys.sh
+++ b/docker/scripts/resolve_rosdep_keys.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 function resolve_rosdep_keys() {
     local src_path=$1

From 0a6922862b810b4dffc88e8bdc60fab689172fd7 Mon Sep 17 00:00:00 2001
From: Ryohsuke Mitsudome <43976834+mitsudome-r@users.noreply.github.com>
Date: Wed, 22 Jan 2025 08:53:24 +0900
Subject: [PATCH 2/2] feat(autoware.repos): use v0.40.0 for
 tier4_ad_api_adaptor (#5675)

Signed-off-by: Ryohsuke Mitsudome <ryohsuke.mitsudome@tier4.jp>
---
 autoware.repos | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autoware.repos b/autoware.repos
index 9cfc06ba9f..6c01d34af1 100644
--- a/autoware.repos
+++ b/autoware.repos
@@ -37,7 +37,7 @@ repositories:
   universe/external/tier4_ad_api_adaptor: # TODO(TIER IV): Migrate to AD API and remove this repository entry.
     type: git
     url: https://github.com/tier4/tier4_ad_api_adaptor.git
-    version: tier4/universe
+    version: v0.40.0
   universe/external/tier4_autoware_msgs:
     type: git
     url: https://github.com/tier4/tier4_autoware_msgs.git