Merge pull request #5692 from jkonecny12/master-live-build-always-upl…

…oad-logs infra: Always store logs of action Live ISO build
rhinstaller · Jun 5, 2024 · 69ea380 · 69ea380
2 parents 289fe9b + 172fac9
commit 69ea380
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git 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
@@ -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