File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -1255,8 +1255,8 @@ tasks:
12551255
12561256- name : debian-package-build
12571257 run_on : &deb-package-build-run_on
1258- - ubuntu2004
1259- - ubuntu2004 -small
1258+ - ubuntu2404-large
1259+ - ubuntu2404 -small
12601260 tags : [packaging]
12611261 commands :
12621262 - func : " fetch source"
@@ -1268,8 +1268,7 @@ tasks:
12681268 script : |-
12691269 set -o errexit
12701270 set -o xtrace
1271- bash .evergreen/debian_package_build.sh --is-patch=${is_patch}
1272- mv ../deb.tar.gz ../deb-${tag_upload_location!|*revision}.tar.gz
1271+ bash .evergreen/debian_package_build.sh --is-patch=${is_patch} --pkg-file-name=${tag_upload_location!|*revision}
12731272 - command : s3.put
12741273 params :
12751274 role_arn : ${upload_arn}
@@ -1311,8 +1310,7 @@ tasks:
13111310 script : |-
13121311 set -o errexit
13131312 set -o xtrace
1314- bash .evergreen/debian_package_build.sh --arch=i386 --is-patch=${is_patch}
1315- mv ../deb.tar.gz ../deb-${tag_upload_location!|*revision}.tar.gz
1313+ bash .evergreen/debian_package_build.sh --arch=i386 --is-patch=${is_patch} --pkg-file-name=${tag_upload_location!|*revision}
13161314 - command : s3.put
13171315 params :
13181316 role_arn : ${upload_arn}
Original file line number Diff line number Diff line change @@ -23,6 +23,9 @@ for arg in "$@"; do
2323 --is-patch=* )
2424 IS_PATCH=" ${arg#* =} "
2525 ;;
26+ --pkg-file-name=* )
27+ PKG_FILE_NAME=" -${arg#* =} "
28+ ;;
2629 * )
2730 echo " Unknown argument '$arg '"
2831 exit 1
@@ -86,7 +89,7 @@ sudo chroot ./unstable-chroot /bin/bash -c '(set -o xtrace && \
8689 /usr/bin/gcc $(pkgconf --cflags libmongocrypt bson2) -o example-state-machine test/example-state-machine.c -lmongocrypt -lbson2 )'
8790
8891[ -e ./unstable-chroot/tmp/libmongocrypt/example-state-machine ] || (echo " Example 'example-state-machine' was not built!" ; exit 1)
89- (cd ./unstable-chroot/tmp/ ; tar zcvf ../../deb.tar.gz * .dsc * .orig.tar.gz * .debian.tar.xz * .build * .deb)
92+ (cd ./unstable-chroot/tmp/ ; tar zcvf " ../../deb${PKG_FILE_NAME} .tar.gz" * .dsc * .orig.tar.gz * .debian.tar.xz * .build * .deb)
9093
9194# Build a second time, to ensure a "double build" works
9295sudo chroot ./unstable-chroot /bin/bash -c " (\
You can’t perform that action at this time.
0 commit comments