WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit 335a0ad

Browse files
committed
Use auroraboot everywhere and position flags correctly
because they are ignored if the come after positional arguments Signed-off-by: Dimitris Karakasilis <[email protected]>
1 parent 4decad7 commit 335a0ad

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.github/workflows/reusable-uki-test.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,10 @@ jobs:
101101
-v $PWD/unpacked:/unpacked \
102102
-v $PWD/build:/result \
103103
-v $PWD/tests/assets/keys:/keys \
104-
quay.io/kairos/osbuilder-tools:latest build-uki dir:/unpacked \
104+
quay.io/kairos/auroraboot:latest build-uki \
105105
--output-dir /result --keys /keys --output-type container \
106-
--single-efi-cmdline "myentry: foobar"
106+
--single-efi-cmdline "myentry: foobar" \
107+
dir:/unpacked
107108
108109
docker load -i build/*.tar
109110
image=$(docker load -i build/*.tar | grep "Loaded image" | awk -F: '{ st = index($0,":");print substr($0,st+1)}' | xargs)

Earthfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -363,12 +363,11 @@ uki-iso:
363363
IF [ "$AURORABOOT_OVERLAY_DIR" != "" ]
364364
COPY $AURORABOOT_OVERLAY_DIR /overlay-iso
365365

366-
RUN --no-cache echo $AURORABOOT_FLAGS | xargs auroraboot build-uki --output-dir /build/ -k /keys --output-type ${AURORABOOT_OUTPUT_TYPE} --overlay-iso /overlay-iso $BASE_IMAGE
366+
RUN --no-cache echo $AURORABOOT_FLAGS | xargs -d' ' -I{} auroraboot build-uki --output-dir /build/ -k /keys --output-type ${AURORABOOT_OUTPUT_TYPE} --overlay-iso /overlay-iso {} $BASE_IMAGE
367367
ELSE
368-
RUN --no-cache echo $AURORABOOT_FLAGS | xargs auroraboot build-uki --output-dir /build/ -k /keys --output-type ${AURORABOOT_OUTPUT_TYPE} $BASE_IMAGE
368+
RUN --no-cache echo $AURORABOOT_FLAGS | xargs -d' ' -I{} auroraboot build-uki --output-dir /build/ -k /keys --output-type ${AURORABOOT_OUTPUT_TYPE} {} $BASE_IMAGE
369369
END
370370

371-
372371
IF [ "$AURORABOOT_OUTPUT_TYPE" == "iso" ]
373372
SAVE ARTIFACT /build/*.iso AS LOCAL build/
374373
ELSE IF [ "$AURORABOOT_OUTPUT_TYPE" == "container" ]

0 commit comments

Comments
 (0)