@@ -72,48 +72,46 @@ jobs:
7272 echo "Matrix image: ${{ matrix.image }}"
7373 env | sort
7474
75- - name : Verify Files
75+ - name : Verify rootfs checksum
7676 run : |
77- echo "Searching for checksum file..."
78- find . -type f -name "${{ matrix.image }}.tar.zst*"
79-
80- echo "=== SHA256 file content ==="
81- cat */${{ matrix.image }}.tar.zst.SHA256 || cat ${{ matrix.image }}.tar.zst.SHA256
82-
83- echo "=== Verifying checksum ==="
84- sha256sum -c */${{ matrix.image }}.tar.zst.SHA256 || sha256sum -c ${{ matrix.image }}.tar.zst.SHA256
77+ CHECKSUM_FILE=$(find . -type f -name "${{ matrix.image }}.tar.zst.SHA256")
78+ ROOTFS_FILE=$(find . -type f -name "${{ matrix.image }}.tar.zst")
79+ echo "Checksum file: $CHECKSUM_FILE"
80+ echo "Rootfs file: $ROOTFS_FILE"
81+ cat "$CHECKSUM_FILE"
82+ sha256sum -c "$CHECKSUM_FILE"
8583
8684 - name : Prepare Dockerfile
8785 run : |
8886 bash scripts/make-dockerfile.sh \
89- "output/$ {{ matrix.image }}.tar.zst" \
87+ "$(find . -type f -name "$ {{ matrix.image }}.tar.zst") " \
9088 "${{ matrix.image }}" \
91- output " true" " Dev"
89+ output true Dev
9290
9391 - name : Debug::List output after Dockerfile generation
94- run : |
95- ls -R output || true
92+ run : ls -R output || true
9693
9794 - name : Prepare Docker Build Context
9895 run : |
99- cp output/${{ matrix.image }}.tar.zst .
100- cp output/Dockerfile.${{ matrix.image }} .
96+ ROOTFS=$(find output -type f -name "${{ matrix.image }}.tar.zst")
97+ DOCKERFILE=$(find output -type f -name "Dockerfile.${{ matrix.image }}")
98+ cp "$ROOTFS" .
99+ cp "$DOCKERFILE" .
101100
102- - name : Build Docker Images
101+ - name : Build Docker Image
103102 run : |
104103 docker build --pull \
105104 -f "Dockerfile.${{ matrix.image }}" \
106105 -t "parchlinux:${{ matrix.image }}" .
107106
108- - name : Save Docker Images as Artifacts
107+ - name : Save Docker Image as Artifact
109108 run : |
110109 docker save "parchlinux:${{ matrix.image }}" | zstd -o "parchlinux-${{ matrix.image }}.tar.zst"
111110
112- - name : Debug::Verify saved docker image file
113- run : |
114- ls -lh "parchlinux-${{ matrix.image }}.tar.zst"
111+ - name : Debug::Verify saved Docker image file
112+ run : ls -lh "parchlinux-${{ matrix.image }}.tar.zst"
115113
116- - name : Upload Docker Image Artifacts
114+ - name : Upload Docker Image Artifact
117115 uses : actions/upload-artifact@v4
118116 with :
119117 name : parchlinux-docker-${{ matrix.image }}
0 commit comments