From ee499a82ea440509fbdd8f2d4cbf9e8546fafeda Mon Sep 17 00:00:00 2001 From: Kenneth Skovhede Date: Wed, 13 Mar 2024 19:57:49 +0100 Subject: [PATCH] Parameterized the bucket name in build scripts for S3 uploads --- build-installers.sh | 10 ++++++---- build-release.sh | 20 +++++++++++--------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/build-installers.sh b/build-installers.sh index 0978461f5..282a235e9 100755 --- a/build-installers.sh +++ b/build-installers.sh @@ -25,6 +25,8 @@ AUTHENTICODE_PASSWORD="${HOME}/.config/signkeys/Duplicati/authenticode.key" MONO=/Library/Frameworks/Mono.framework/Commands/mono VBOX_USER=IEUser@192.168.56.102 +S3_BUCKET_NAME="updates.duplicati.com" + GPG=/usr/local/bin/gpg2 # Newer GPG needs this to allow input from a non-terminal @@ -256,7 +258,7 @@ echo "{" > "./tmp/latest-installers.json" process_installer() { if [ "$2" != "zip" ]; then - aws --profile=duplicati-upload s3 cp "${UPDATE_TARGET}/$1" "s3://updates.duplicati.com/${BUILDTYPE}/$1" + aws --profile=duplicati-upload s3 cp "${UPDATE_TARGET}/$1" "s3://${S3_BUCKET_NAME}/${BUILDTYPE}/$1" fi local MD5=$(md5 ${UPDATE_TARGET}/$1 | awk -F ' ' '{print $NF}') @@ -293,8 +295,8 @@ echo "duplicati_installers =" > "./tmp/latest-installers.js" cat "./tmp/latest-installers.json" >> "./tmp/latest-installers.js" echo ";" >> "./tmp/latest-installers.js" -aws --profile=duplicati-upload s3 cp "./tmp/latest-installers.json" "s3://updates.duplicati.com/${BUILDTYPE}/latest-installers.json" -aws --profile=duplicati-upload s3 cp "./tmp/latest-installers.js" "s3://updates.duplicati.com/${BUILDTYPE}/latest-installers.js" +aws --profile=duplicati-upload s3 cp "./tmp/latest-installers.json" "s3://${S3_BUCKET_NAME}/${BUILDTYPE}/latest-installers.json" +aws --profile=duplicati-upload s3 cp "./tmp/latest-installers.js" "s3://${S3_BUCKET_NAME}/${BUILDTYPE}/latest-installers.js" if [ -d "./tmp" ]; then rm -rf "./tmp" @@ -324,7 +326,7 @@ cd .. mv "./tmp/${SIGNAME}" "${UPDATE_TARGET}/${SIGNAME}" rm -rf "./tmp/${SIG_FOLDER}" -aws --profile=duplicati-upload s3 cp "${UPDATE_TARGET}/${SIGNAME}" "s3://updates.duplicati.com/${BUILDTYPE}/${SIGNAME}" +aws --profile=duplicati-upload s3 cp "${UPDATE_TARGET}/${SIGNAME}" "s3://${S3_BUCKET_NAME}/${BUILDTYPE}/${SIGNAME}" GITHUB_TOKEN=$(cat "${GITHUB_TOKEN_FILE}") diff --git a/build-release.sh b/build-release.sh index 23293a8fb..2f196ddcd 100644 --- a/build-release.sh +++ b/build-release.sh @@ -20,6 +20,8 @@ RELEASE_FILE_NAME="duplicati-${RELEASE_NAME}" GIT_STASH_NAME="auto-build-${RELEASE_TIMESTAMP}" +S3_BUCKET_NAME="updates.duplicati.com" + UPDATE_ZIP_URLS="https://updates.duplicati.com/${RELEASE_TYPE}/${RELEASE_FILE_NAME}.zip;https://alt.updates.duplicati.com/${RELEASE_TYPE}/${RELEASE_FILE_NAME}.zip" UPDATE_MANIFEST_URLS="https://updates.duplicati.com/${RELEASE_TYPE}/latest.manifest;https://alt.updates.duplicati.com/${RELEASE_TYPE}/latest.manifest" UPDATER_KEYFILE="${HOME}/.config/signkeys/Duplicati/updater-release.key" @@ -301,12 +303,12 @@ cp "${UPDATE_TARGET}/latest.zip.sig.asc" "${UPDATE_TARGET}/${RELEASE_FILE_NAME}. "${MONO}" "BuildTools/UpdateVersionStamp/bin/Release/UpdateVersionStamp.exe" --version="${RELEASE_VERSION}" echo "Uploading binaries" -"${AWS}" --profile=duplicati-upload s3 cp "${UPDATE_TARGET}/${RELEASE_FILE_NAME}.zip" "s3://updates.duplicati.com/${RELEASE_TYPE}/${RELEASE_FILE_NAME}.zip" -"${AWS}" --profile=duplicati-upload s3 cp "${UPDATE_TARGET}/${RELEASE_FILE_NAME}.zip.sig" "s3://updates.duplicati.com/${RELEASE_TYPE}/${RELEASE_FILE_NAME}.zip.sig" -"${AWS}" --profile=duplicati-upload s3 cp "${UPDATE_TARGET}/${RELEASE_FILE_NAME}.zip.sig.asc" "s3://updates.duplicati.com/${RELEASE_TYPE}/${RELEASE_FILE_NAME}.zip.sig.asc" -"${AWS}" --profile=duplicati-upload s3 cp "${UPDATE_TARGET}/${RELEASE_FILE_NAME}.manifest" "s3://updates.duplicati.com/${RELEASE_TYPE}/${RELEASE_FILE_NAME}.manifest" +"${AWS}" --profile=duplicati-upload s3 cp "${UPDATE_TARGET}/${RELEASE_FILE_NAME}.zip" "s3://${S3_BUCKET_NAME}/${RELEASE_TYPE}/${RELEASE_FILE_NAME}.zip" +"${AWS}" --profile=duplicati-upload s3 cp "${UPDATE_TARGET}/${RELEASE_FILE_NAME}.zip.sig" "s3://${S3_BUCKET_NAME}/${RELEASE_TYPE}/${RELEASE_FILE_NAME}.zip.sig" +"${AWS}" --profile=duplicati-upload s3 cp "${UPDATE_TARGET}/${RELEASE_FILE_NAME}.zip.sig.asc" "s3://${S3_BUCKET_NAME}/${RELEASE_TYPE}/${RELEASE_FILE_NAME}.zip.sig.asc" +"${AWS}" --profile=duplicati-upload s3 cp "${UPDATE_TARGET}/${RELEASE_FILE_NAME}.manifest" "s3://${S3_BUCKET_NAME}/${RELEASE_TYPE}/${RELEASE_FILE_NAME}.manifest" -"${AWS}" --profile=duplicati-upload s3 cp "s3://updates.duplicati.com/${RELEASE_TYPE}/${RELEASE_FILE_NAME}.manifest" "s3://updates.duplicati.com/${RELEASE_TYPE}/latest.manifest" +"${AWS}" --profile=duplicati-upload s3 cp "s3://${S3_BUCKET_NAME}/${RELEASE_TYPE}/${RELEASE_FILE_NAME}.manifest" "s3://${S3_BUCKET_NAME}/${RELEASE_TYPE}/latest.manifest" ZIP_MD5=$(md5 ${UPDATE_TARGET}/${RELEASE_FILE_NAME}.zip | awk -F ' ' '{print $NF}') ZIP_SHA1=$(shasum -a 1 ${UPDATE_TARGET}/${RELEASE_FILE_NAME}.zip | awk -F ' ' '{print $1}') @@ -331,13 +333,13 @@ echo "duplicati_version_info =" > "latest.js" cat "latest.json" >> "latest.js" echo ";" >> "latest.js" -"${AWS}" --profile=duplicati-upload s3 cp "latest.json" "s3://updates.duplicati.com/${RELEASE_TYPE}/latest.json" -"${AWS}" --profile=duplicati-upload s3 cp "latest.js" "s3://updates.duplicati.com/${RELEASE_TYPE}/latest.js" +"${AWS}" --profile=duplicati-upload s3 cp "latest.json" "s3://${S3_BUCKET_NAME}/${RELEASE_TYPE}/latest.json" +"${AWS}" --profile=duplicati-upload s3 cp "latest.js" "s3://${S3_BUCKET_NAME}/${RELEASE_TYPE}/latest.js" # echo "Propagating to other build types" # for OTHER in ${OTHER_UPLOADS}; do -# aws --profile=duplicati-upload s3 cp "s3://updates.duplicati.com/${RELEASE_TYPE}/${RELEASE_FILE_NAME}.manifest" "s3://updates.duplicati.com/${OTHER}/latest.manifest" -# aws --profile=duplicati-upload s3 cp "s3://updates.duplicati.com/${RELEASE_TYPE}/latest.json" "s3://updates.duplicati.com/${OTHER}/latest.json" +# aws --profile=duplicati-upload s3 cp "s3://${S3_BUCKET_NAME}/${RELEASE_TYPE}/${RELEASE_FILE_NAME}.manifest" "s3://${S3_BUCKET_NAME}/${OTHER}/latest.manifest" +# aws --profile=duplicati-upload s3 cp "s3://${S3_BUCKET_NAME}/${RELEASE_TYPE}/latest.json" "s3://${S3_BUCKET_NAME}/${OTHER}/latest.json" # done rm "${RELEASE_CHANGELOG_NEWS_FILE}"