more fixes

Author: sebsto

.github/workflows/integration_tests.yml

@@ -109,7 +109,7 @@ jobs:
         run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
       - name: Test the archive plugin
         run: |
-          which curl yq || (apt -q update && apt -yq install curl yq)
+          which curl || (apt -q update && apt -yq install curl)
           curl -s https://raw.githubusercontent.com/swift-sever/swift-aws-lambda-runtime/refs/heads/main/.github/workflows/scripts/check-archive-plugin.sh | bash
 
   check-foundation:
@@ -126,5 +126,5 @@ jobs:
         run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
       - name: Check for Foundation or ICU dependency
         run: |
-          which curl yq || (apt -q update && apt -yq install curl yq)
-          curl -s https://raw.githubusercontent.com/swift-sever/swift-aws-lambda-runtime/refs/heads/main/.github/workflows/scripts/check-link-foundation.sh | bash
+          which curl || (apt -q update && apt -yq install curl)
+          curl -s https://raw.githubusercontent.com/swift-server/swift-aws-lambda-runtime/refs/heads/main/.github/workflows/scripts/check-link-foundation.sh | bash

.github/workflows/scripts/check-archive-plugin.sh

@@ -13,8 +13,6 @@
 ##
 ##===----------------------------------------------------------------------===##
 
-#!/bin/bash
-
 EXAMPLE=HelloWorld
 OUTPUT_DIR=.build/plugins/AWSLambdaPackager/outputs/AWSLambdaPackager
 OUTPUT_FILE=${OUTPUT_DIR}/MyLambda/bootstrap

.github/workflows/scripts/check-link-foundation.sh

@@ -13,22 +13,23 @@
 ##
 ##===----------------------------------------------------------------------===##
 
-#!/bin/bash
+log() { printf -- "** %s\n" "$*" >&2; }
+error() { printf -- "** ERROR: %s\n" "$*" >&2; }
+fatal() { error "$@"; exit 1; }
 
 EXAMPLE=APIGateway
 OUTPUT_DIR=.build/release
 OUTPUT_FILE=${OUTPUT_DIR}/APIGatewayLambda
 LIBS_TO_CHECK="libFoundation.so libFoundationInternationalization.so lib_FoundationICU.so"
 
-pushd Examples/${EXAMPLE} || exit 1
+pushd Examples/${EXAMPLE} || fatal "Failed to change directory to Examples/${EXAMPLE}."
 
 # recompile the example without the --static-swift-stdlib flag
-LAMBDA_USE_LOCAL_DEPS=../.. swift build -c release -Xlinker -s
+LAMBDA_USE_LOCAL_DEPS=../.. swift build -c release -Xlinker -s || fatal "Failed to build the example."
 
 # check if the binary exists
 if [ ! -f "${OUTPUT_FILE}" ]; then
-  echo "❌ ${OUTPUT_FILE} does not exist."
-  exit 1
+  error "❌ ${OUTPUT_FILE} does not exist."
 fi
 
 # Checking for Foundation or ICU dependencies
@@ -42,10 +43,10 @@ for LIB in ${LIBS_TO_CHECK}; do
 
   # 1 is success (grep failed to find the lib), 0 is failure (grep successly found the lib)
   SUCCESS=$?
-  [ "$SUCCESS" -eq 0 ] && echo "❌ ${LIB} found." && break || echo "✅ ${LIB} not found."
+  [ "$SUCCESS" -eq 0 ] && log "❌ ${LIB} found." && break || log "✅ ${LIB} not found."
 done
 
-popd || exit 1
+popd || fatal "Failed to change directory back to the root directory."
 
 # exit code is the opposite of the grep exit code
-[ "$SUCCESS" -eq 0 ] && echo "❌ At least one foundation lib was found, reporting the error." && exit 1 || echo "✅ No foundation lib found, congrats!" && exit 0
+[ "$SUCCESS" -eq 0 ] && error "❌ At least one foundation lib was found, reporting the error." || log "✅ No foundation lib found, congrats!" && exit 0