Merge pull request coreos#937 from HuijingHei/ci-get-esp

ci: get esp part using `sfdisk`

Author: cgwalters

.github/workflows/ci.yml

@@ -67,8 +67,9 @@ jobs:
             --disable-selinux --generic-image --via-loopback /target/myimage.raw
           # Verify we installed grub.cfg and shim on the disk
           sudo losetup -P -f myimage.raw
-          device=$(losetup --list --noheadings --output NAME,BACK-FILE | grep myimage.raw | awk '{print $1}')
-          sudo mount "${device}p2" /mnt/
+          device=$(losetup -a myimage.raw --output NAME -n)
+          esp_part=$(sudo sfdisk -l -J "${device}" | jq -r '.partitiontable.partitions[] | select(.type == "C12A7328-F81F-11D2-BA4B-00A0C93EC93B").node')
+          sudo mount "${esp_part}" /mnt/
           arch="$(uname --machine)"
           if [[ "${arch}" == "x86_64" ]]; then
             shim="shimx64.efi"

ci/Containerfile.c9s

@@ -8,6 +8,6 @@ WORKDIR /build
 # We aren't using the full recommendations there, just the simple bits.
 RUN --mount=type=cache,target=/build/target --mount=type=cache,target=/var/roothome make && make bin-archive && mkdir -p /out && cp target/bootupd.tar.zst /out
 
-FROM quay.io/centos-bootc/centos-bootc-dev:stream9
+FROM quay.io/centos-bootc/centos-bootc:stream9
 COPY --from=build /out/bootupd.tar.zst /tmp
 RUN tar -C / --zstd -xvf /tmp/bootupd.tar.zst && rm -rvf /tmp/*