Test3

Author: JonnyHaystack

.github/workflows/ci.yaml

@@ -35,21 +35,22 @@ jobs:
       - run: sudo chown root /bin/tar && sudo chmod u+s /bin/tar
         if: ${{ steps.split.outputs._0 == 'ubuntu' }}
 
-      - name: Set image filename env var
-        run: echo "IMAGE_FILENAME=${{ steps.split.outputs._0 }}-${{ steps.split.outputs._1 }}-${{ matrix.version }}" >> "$GITHUB_ENV"
-
       - uses: actions/cache@v4
         with:
           path: /home/runner/.cache/image-create
-          key: ${{ env.IMAGE_FILENAME }}-${{ github.head_ref || github.ref_name }}
+          key: ${{ steps.split.outputs._0 }}-${{ steps.split.outputs._1 }}-${{ matrix.version }}-${{ github.head_ref || github.ref_name }}
           restore-keys: |
-            ${{ env.IMAGE_FILENAME }}-${{ github.head_ref || github.ref_name }}
-            ${{ env.IMAGE_FILENAME }}
+            ${{ steps.split.outputs._0 }}-${{ steps.split.outputs._1 }}-${{ matrix.version }}-${{ github.head_ref || github.ref_name }}
+            ${{ steps.split.outputs._0 }}-${{ steps.split.outputs._1 }}-${{ matrix.version }}
             ${{ steps.split.outputs._0 }}-${{ steps.split.outputs._1 }}
 
+      - name: Set image filename env var
+        run: echo "IMAGE_NAME=${{ steps.split.outputs._0 }}-${{ steps.split.outputs._1 }}-${{ matrix.version }}" >> "$GITHUB_ENV"
+
       - run: |
+          ls -lah
           uv run disk-image-create vm block-device-efi ${{ steps.split.outputs._0 }} kubernetes
-          mv image.qcow2 "${IMAGE_FILENAME}.qcow2"
+          # mv image.qcow2 "${IMAGE_NAME}.qcow2"
         env:
           ELEMENTS_PATH: ${{ github.workspace }}/elements
           DIB_RELEASE: ${{ steps.split.outputs._1 }}
@@ -59,13 +60,13 @@ jobs:
       - name: Publish artifact
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ env.IMAGE_FILENAME }}
-          path: ${{ env.IMAGE_FILENAME }}.qcow2
+          name: ${{ env.IMAGE_NAME }}
+          path: ${{ env.IMAGE_NAME }}.qcow2
           if-no-files-found: error
           retention-days: 7
 
       - name: Upload image to release
         uses: softprops/action-gh-release@v1
         if: github.ref_type == 'tag'
         with:
-          files: ${{ env.IMAGE_FILENAME }}.qcow2
+          files: ${{ env.IMAGE_NAME }}.qcow2