From dd8baaab8da72db470f9b5127637bea709863b34 Mon Sep 17 00:00:00 2001
From: Patrick Roy <roypat@amazon.co.uk>
Date: Thu, 10 Apr 2025 15:37:44 +0100
Subject: [PATCH] fix: dont fail silently on awscli errors during artifact
 setup

If something goes wrong during aws s3 cp, exit early with an error
message instead of quietly trying to soldier on. A common(-ish) cause of
something going wrong here is having installed the aws cli for the wrong
CPU architecture (e.g. x86 AWSCLi on ARM64), as the awscli installer
apparently doesnt not check the architecture, and its easy to copy the
wrong command from the website.

Signed-off-by: Patrick Roy <roypat@amazon.co.uk>
---
 tools/devtool | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/devtool b/tools/devtool
index 57637a553cc..61b34b6859e 100755
--- a/tools/devtool
+++ b/tools/devtool
@@ -575,6 +575,7 @@ ensure_ci_artifacts() {
     if [ ! -d "$ARTIFACTS" ]; then
         mkdir -pv $ARTIFACTS
         aws s3 sync --no-sign-request "$S3_URL" "$ARTIFACTS"
+        ok_or_die "Failed to download CI artifacts using awscli!"
         cmd_sh "./tools/setup-ci-artifacts.sh"
     fi
 }