fix up artifact uploads

potassium-os · May 2, 2024 · 6b5dac1 · 6b5dac1
1 parent b297dd8
commit 6b5dac1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 34 deletions.
diff --git a/.github/workflows/installer-live-build.yml b/.github/workflows/installer-live-build.yml
@@ -19,19 +19,6 @@ jobs:
     - name: Upload output
       uses: actions/upload-artifact@v4
       with:
-        name: livecd-output
+        name: output
         path: |
-          ./debian-live/output/info/binary.modified_timestamps
-          ./debian-live/output/info/build.log
-          ./debian-live/output/info/chroot.files
-          ./debian-live/output/info/chroot.packages.install
-          ./debian-live/output/info/chroot.packages.live
-          ./debian-live/output/iso/live-image-amd64.contents
-          ./debian-live/output/iso/live-image-amd64.files
-          ./debian-live/output/iso/live-image-amd64.hybrid.iso
-          ./debian-live/output/iso/live-image-amd64.packages
-          ./debian-live/output/boot/chroot/boot"/*
-          ./debian-live/output/live/binary/live/filesystem.squashfs
-          ./debian-live/output/live/binary/live/filesystem.packages
-          ./debian-live/output/live/binary/live/initrd.img"
-          ./debian-live/output/live/binary/live/vmlinuz"
+          ./debian-live/output/
diff --git a/debian-live/build.sh b/debian-live/build.sh
@@ -29,11 +29,7 @@ BUILD_ID=$(date --utc +%Y%m%d_%H%M%SZ)
 
 BUILD_DIR="${TOP_DIR}/build/${BUILD_ID}"
 
-if [ -n "${CI}" ]; then
-  OUTPUT_DIR="${TOP_DIR}/output/"
-else
-  OUTPUT_DIR="${TOP_DIR}/output/${BUILD_ID}"
-fi
+OUTPUT_DIR="${TOP_DIR}/output/"
 
 mkdir -p "${BUILD_DIR}"
 
@@ -55,17 +51,14 @@ sudo podman run \
 
 mkdir -p "${OUTPUT_DIR}"/{info,iso,boot,live}
 
-cp -v  "${BUILD_DIR}/binary.modified_timestamps"      "${OUTPUT_DIR}/info/"
-cp -v  "${BUILD_DIR}/build.log"                       "${OUTPUT_DIR}/info/"
-cp -v  "${BUILD_DIR}/chroot.files"                    "${OUTPUT_DIR}/info/"
-cp -v  "${BUILD_DIR}/chroot.packages.install"         "${OUTPUT_DIR}/info/"
-cp -v  "${BUILD_DIR}/chroot.packages.live"            "${OUTPUT_DIR}/info/"
-cp -v  "${BUILD_DIR}/live-image-amd64.contents"       "${OUTPUT_DIR}/iso/"
-cp -v  "${BUILD_DIR}/live-image-amd64.files"          "${OUTPUT_DIR}/iso/"
-cp -v  "${BUILD_DIR}/live-image-amd64.hybrid.iso"     "${OUTPUT_DIR}/iso/"
-cp -v  "${BUILD_DIR}/live-image-amd64.packages"       "${OUTPUT_DIR}/iso/"
-cp -Rv "${BUILD_DIR}/chroot/boot"/**                  "${OUTPUT_DIR}/boot"
-cp -v  "${BUILD_DIR}/binary/live/filesystem.squashfs" "${OUTPUT_DIR}/live"
-cp -v  "${BUILD_DIR}/binary/live/filesystem.packages" "${OUTPUT_DIR}/live"
-cp -v  "${BUILD_DIR}/binary/live/initrd.img"*         "${OUTPUT_DIR}/live"
-cp -v  "${BUILD_DIR}/binary/live/vmlinuz"*            "${OUTPUT_DIR}/live"
+cp -v  "${BUILD_DIR}/binary.modified_timestamps"  "${OUTPUT_DIR}/info/"
+cp -v  "${BUILD_DIR}/build.log"                   "${OUTPUT_DIR}/info/"
+cp -v  "${BUILD_DIR}/chroot.files"                "${OUTPUT_DIR}/info/"
+cp -v  "${BUILD_DIR}/chroot.packages.install"     "${OUTPUT_DIR}/info/"
+cp -v  "${BUILD_DIR}/chroot.packages.live"        "${OUTPUT_DIR}/info/"
+cp -v  "${BUILD_DIR}/live-image-amd64.contents"   "${OUTPUT_DIR}/iso/"
+cp -v  "${BUILD_DIR}/live-image-amd64.files"      "${OUTPUT_DIR}/iso/"
+cp -v  "${BUILD_DIR}/live-image-amd64.hybrid.iso" "${OUTPUT_DIR}/iso/"
+cp -v  "${BUILD_DIR}/live-image-amd64.packages"   "${OUTPUT_DIR}/iso/"
+cp -Rv "${BUILD_DIR}/chroot/boot"                 "${OUTPUT_DIR}/boot"
+cp -Rv "${BUILD_DIR}/binary/live"                 "${OUTPUT_DIR}/live"