From 172fac9cfc7c0f078e9117659fef1248f10eecae Mon Sep 17 00:00:00 2001 From: Jiri Konecny Date: Wed, 5 Jun 2024 09:59:09 +0200 Subject: [PATCH] infra: Always store logs of action Live ISO build Currently, it seems that if Makefile command to build Live ISO fails it will stop execution of the next mv commands. Let's not move logs and instead store them where they are created so we always collect them in the next task. --- .github/workflows/build-image.yml | 4 +--- .github/workflows/build-image.yml.j2 | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml index 7aaa3c08402..7253fa4dd49 100644 --- a/.github/workflows/build-image.yml +++ b/.github/workflows/build-image.yml @@ -261,7 +261,6 @@ jobs: mkdir -p images make -f Makefile.am container-live-iso-build CI_TAG=$CONTAINER_TAG mv result/iso/Fedora-Workstation.iso "images/${{ needs.pr-info.outputs.image_description }}-Fedora-Workstation.iso" - mv result/iso/logs images/ - name: Make artefacts created by sudo cleanable if: always() @@ -273,8 +272,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: 'logs' - path: | - images/logs/* + path: result/iso/logs/* - name: Upload image artifacts uses: actions/upload-artifact@v4 diff --git a/.github/workflows/build-image.yml.j2 b/.github/workflows/build-image.yml.j2 index a51b6f281f2..653d8f94294 100644 --- a/.github/workflows/build-image.yml.j2 +++ b/.github/workflows/build-image.yml.j2 @@ -255,7 +255,6 @@ jobs: mkdir -p images make -f Makefile.am container-live-iso-build CI_TAG=$CONTAINER_TAG mv result/iso/Fedora-Workstation.iso "images/${{ needs.pr-info.outputs.image_description }}-Fedora-Workstation.iso" - mv result/iso/logs images/ - name: Make artefacts created by sudo cleanable if: always() @@ -267,8 +266,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: 'logs' - path: | - images/logs/* + path: result/iso/logs/* - name: Upload image artifacts uses: actions/upload-artifact@v4