fix postoutput scripts

Signed-off-by: bakhtin <a@bakhtin.net>

Author: bakhtin

.github/workflows/release.yml

@@ -84,7 +84,7 @@ jobs:
 
       - name: Upload to R2
         run: |
-          for file in mkosi.output/*.{efi,tar.gz,vhd,minisign,checksums.sha256}; do
+          for file in mkosi.output/*.{efi,tar.gz,vhd,minisig,sha256}; do
             rclone copy "$file" r2-flashbots-public-artifacts:flashbots-public-artifacts/buildernet-images/${GITHUB_REF_NAME#v}/$file
           done
 

mkosi.images/buildernet-azure/mkosi.postoutput

@@ -4,7 +4,7 @@ set -eu -o pipefail
 
 export SOURCE_DATE_EPOCH=0 # not propagated from the main config, needed for mkfs.vfat
 mkdir -p ${OUTPUTDIR}/esp/EFI/BOOT
-cp ${OUTPUTDIR}/${IMAGE_ID}.efi ${OUTPUTDIR}/esp/EFI/BOOT/BOOTX64.EFI
+cp ${OUTPUTDIR}/${IMAGE_ID}_${IMAGE_VERSION}.efi ${OUTPUTDIR}/esp/EFI/BOOT/BOOTX64.EFI
 rm -f ${OUTPUTDIR}/${IMAGE_ID}.raw
 
 systemd-repart --empty=create \
@@ -13,8 +13,8 @@ systemd-repart --empty=create \
   --copy-source=${OUTPUTDIR} \
   --seed=630b5f72-a36a-4e83-b23d-6ef47c82fd9c \
   --dry-run=no \
-  ${OUTPUTDIR}/${IMAGE_ID}.raw
+  ${OUTPUTDIR}/${IMAGE_ID}_${IMAGE_VERSION}.raw
 
 rm -rf ${OUTPUTDIR}/esp
-./scripts/raw-to-vhd.sh ${OUTPUTDIR}/${IMAGE_ID}.raw ${OUTPUTDIR}/${IMAGE_ID}.vhd
-rm -f ${OUTPUTDIR}/${IMAGE_ID}.raw
+./scripts/raw-to-vhd.sh ${OUTPUTDIR}/${IMAGE_ID}_${IMAGE_VERSION}.raw ${OUTPUTDIR}/${IMAGE_ID}_${IMAGE_VERSION}.vhd
+rm -f ${OUTPUTDIR}/${IMAGE_ID}_${IMAGE_VERSION}.raw

mkosi.images/buildernet-gcp/mkosi.postoutput

@@ -5,22 +5,22 @@ set -eu -o pipefail
 export SOURCE_DATE_EPOCH=0 # not propagated from the main config, needed for mkfs.vfat
 export SYSTEMD_REPART_MKFS_OPTIONS_VFAT="-i 12345678"
 mkdir -p ${OUTPUTDIR}/esp/EFI/BOOT
-cp ${OUTPUTDIR}/${IMAGE_ID}.efi ${OUTPUTDIR}/esp/EFI/BOOT/BOOTX64.EFI
-rm -f ${OUTPUTDIR}/${IMAGE_ID}.raw
+cp ${OUTPUTDIR}/${IMAGE_ID}_${IMAGE_VERSION}.efi ${OUTPUTDIR}/esp/EFI/BOOT/BOOTX64.EFI
+rm -f ${OUTPUTDIR}/${IMAGE_ID}_${IMAGE_VERSION}.raw
 
 systemd-repart --empty=create \
   --size=auto \
   --definitions=mkosi.images/buildernet/repart.d \
   --copy-source=${OUTPUTDIR} \
   --seed=630b5f72-a36a-4e83-b23d-6ef47c82fd9c \
   --dry-run=no \
-  ${OUTPUTDIR}/${IMAGE_ID}.raw
-sgdisk --disk-guid "12345678-1234-5678-1234-567812345678" ${OUTPUTDIR}/${IMAGE_ID}.raw
+  ${OUTPUTDIR}/${IMAGE_ID}_${IMAGE_VERSION}.raw
+sgdisk --disk-guid "12345678-1234-5678-1234-567812345678" ${OUTPUTDIR}/${IMAGE_ID}_${IMAGE_VERSION}.raw
 
 rm -rf ${OUTPUTDIR}/esp
 
 cd ${OUTPUTDIR}
-ln -sf ${IMAGE_ID}.raw disk.raw
-tar --dereference --format=oldgnu -Sczf ${IMAGE_ID}-import.tar.gz disk.raw
+ln -sf ${IMAGE_ID}_${IMAGE_VERSION}.raw disk.raw
+tar --dereference --format=oldgnu -Sczf ${IMAGE_ID}_${IMAGE_VERSION}-import.tar.gz disk.raw
 unlink disk.raw
-rm -f ${OUTPUTDIR}/${IMAGE_ID}.raw
+rm -f ${OUTPUTDIR}/${IMAGE_ID}_${IMAGE_VERSION}.raw