From cb17bf4fd3d994eb90bc8fd91f7710ced9ba5b42 Mon Sep 17 00:00:00 2001 From: Itxaka Date: Thu, 4 May 2023 15:39:51 +0200 Subject: [PATCH] [Will drop]Allow building kcrypt from branches Otherwise any changes that need both wont pass tests. Signed-off-by: Itxaka --- .github/workflows/e2e-tests.yml | 2 +- Earthfile | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 2b740c4..f11498a 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -51,7 +51,7 @@ jobs: sudo luet repo add -y kairos --url quay.io/kairos/packages --type docker LUET_NOLOCK=true sudo -E luet install -y container/kubectl utils/k3d utils/earthly - earthly -P +iso + earthly -P +iso --KCRYPT_DEV=true export ISO=$PWD/build/challenger.iso # Configure earthly to use the docker mirror in CI diff --git a/Earthfile b/Earthfile index c771fe1..5d69826 100644 --- a/Earthfile +++ b/Earthfile @@ -15,6 +15,14 @@ build-challenger: image: FROM $BASE_IMAGE ARG IMAGE + # TEST KCRYPT FROM BRANCH + ARG KCRYPT_DEV + ARG KCRYPT_DEV_BRANCH=main + IF [ "$KCRYPT_DEV" = "true" ] + RUN rm /usr/bin/kcrypt + COPY github.com/kairos-io/kcrypt:$KCRYPT_DEV_BRANCH+build-kcrypt/kcrypt /usr/bin/kcrypt + END + # END COPY +build-challenger/kcrypt-discovery-challenger /system/discovery/kcrypt-discovery-challenger SAVE IMAGE $IMAGE