File tree Expand file tree Collapse file tree 3 files changed +5
-4
lines changed
buildkite/scripts/release Expand file tree Collapse file tree 3 files changed +5
-4
lines changed Original file line number Diff line number Diff line change @@ -439,12 +439,12 @@ function publish_debian() {
439439 echo " 🍥 Publishing $__artifact debian to $__channel channel with $__target_version version"
440440 echo " 📦 Target debian version: $( calculate_debian_version $__artifact $__target_version $__codename " $__network " " $__arch " ) "
441441 if [[ $__dry_run == 0 ]]; then
442- # shellcheck disable=SC2068
442+ # shellcheck disable=SC2068,SC2046
443443 prefix_cmd " $SUBCOMMAND_TAB " source $SCRIPTPATH /../../../scripts/debian/publish.sh \
444444 --names " $DEBIAN_CACHE_FOLDER /$__codename /${__new_artifact_name} _${__target_version} _${__arch} .deb" \
445445 --version $__target_version \
446446 --bucket $__debian_repo \
447- " $( if [[ $__force_upload_debians == 1 ]]; then echo " --force" ; fi) " \
447+ $( if [[ $__force_upload_debians == 1 ]]; then echo " --force" ; fi) \
448448 -c $__codename \
449449 -r $__channel \
450450 --arch $__arch \
Original file line number Diff line number Diff line change @@ -109,8 +109,9 @@ for _ in {1..10}; do (
109109# >> Repository is locked by another user: at host dc7eaad3c537
110110# >> Attempting to obtain a lock
111111# /var/lib/gems/2.3.0/gems/deb-s3-0.10.0/lib/deb/s3/lock.rb:24:in `throw': uncaught throw #"Unable to obtain a lock after 60, giving up."
112+ # shellcheck disable=SC2046
112113deb-s3 upload $BUCKET_ARG $S3_REGION_ARG \
113- " $( [ " $FORCE " -eq 0 ] && echo " --fail-if-exists" ) " \
114+ $( if [[ " $FORCE " -eq 0 ]] ; then echo " --fail-if-exists" ; fi ) \
114115 --lock \
115116 --arch $ARCH \
116117 --preserve-versions \
Original file line number Diff line number Diff line change @@ -96,7 +96,7 @@ SCRIPT=' set -x \
9696
9797case $CODENAME in
9898 bullseye|bookworm) DOCKER_IMAGE=" debian:$CODENAME " ;;
99- focal|noble) DOCKER_IMAGE=" ubuntu:$CODENAME " ;;
99+ focal|noble|jammy ) DOCKER_IMAGE=" ubuntu:$CODENAME " ;;
100100 * ) echo " ❌ Unknown codename passed: $CODENAME " ; exit 1;;
101101esac
102102
You can’t perform that action at this time.
0 commit comments