From 27445f53211b843f0bdb641b4bfd40c1f0dcfe6a Mon Sep 17 00:00:00 2001 From: Alberto Schiabel Date: Tue, 28 Jan 2025 14:14:03 +0100 Subject: [PATCH] fix(ci): specify explicit aws cli version on "release-artifacts" job (#5141) * fix(ci): specify explicit aws cli version on "release-artifacts" job * fix(ci): specify explicit aws cli version 1.36.40 on "release-artifacts" job * chore: inline action * ci: activate venv in AWS uploads * ci: activate venv in AWS upload script --------- Co-authored-by: jkomyno <12381818+jkomyno@users.noreply.github.com> Co-authored-by: Jacek Malec --- .github/workflows/utils/uploadAndVerify.sh | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/utils/uploadAndVerify.sh b/.github/workflows/utils/uploadAndVerify.sh index 606a4c2532f..7ad4baebf68 100644 --- a/.github/workflows/utils/uploadAndVerify.sh +++ b/.github/workflows/utils/uploadAndVerify.sh @@ -2,6 +2,12 @@ set -eux; +AWS_CLI_VERSION=1.36.40 + +python -m venv .venv +source .venv/bin/activate +pip install awscli==$AWS_CLI_VERSION + # engines-artifacts-for-r2 # engines-artifacts-for-s3 LOCAL_DIR_PATH=$1 @@ -48,7 +54,7 @@ if [ "$FILECOUNT_FOR_SIG" -eq 0 ]; then fi # Manual check -# +# # Set PROD env vars # mkdir engines-artifacts-from-prod # Download the artifacts from the S3 bucket @@ -56,9 +62,9 @@ fi # Print the files and save the output to a file # cd engines-artifacts-from-prod # find . | sort > ../expectedFiles.txt -# +# # cd .. -# +# # Set DEV env vars # mkdir engines-artifacts-from-dev # Download the artifacts from the S3 bucket @@ -107,11 +113,11 @@ fi FILES_TO_VALIDATE_WITH_LDD=$(find . -type f | grep -E "./(rhel|debian)-openssl-(3.0|1.1).*(query-engine|schema-engine|libquery_engine.so.node)$") echo "FILES_TO_VALIDATE_WITH_LDD: $FILES_TO_VALIDATE_WITH_LDD" -for filename in $FILES_TO_VALIDATE_WITH_LDD -do +for filename in $FILES_TO_VALIDATE_WITH_LDD +do echo "Validating libssl linking for $filename." GREP_OUTPUT=$(ldd "$filename" | grep "libssl") - OUTPUT=$(echo "$GREP_OUTPUT" | cut -f2 | cut -d'.' -f1) + OUTPUT=$(echo "$GREP_OUTPUT" | cut -f2 | cut -d'.' -f1) if [[ "$OUTPUT" == "libssl" ]]; then echo "Linux build linked correctly to libssl."