File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -133,10 +133,13 @@ jobs:
133133 image: valori-node:ci
134134 EOF
135135
136+ # Only start the "valori" service — valori-ui's image isn't
137+ # published to GHCR for this CI run, and `up -d` with no service
138+ # argument would try (and fail) to pull it too.
136139 docker compose \
137140 -f docker-compose.yml \
138141 -f /tmp/ci-image-override.yml \
139- up -d
142+ up -d valori
140143
141144 # Wait up to 60 s for the single node to become healthy.
142145 for i in $(seq 1 12); do
Original file line number Diff line number Diff line change @@ -146,17 +146,15 @@ jobs:
146146 - name : Flatten dist directory
147147 run : |
148148 # download-artifact@v4 nests each artifact as dist/<artifact-name>/<file>.
149- # When the artifact name matches the file name the src and dst are the
150- # same inode — skip the copy in that case to avoid the "same file" error.
151- find dist/ -mindepth 2 -type f | while read f; do
152- dest="dist/$(basename "$f")"
153- src_inode=$(stat -c '%i' "$f" 2>/dev/null || stat -f '%i' "$f")
154- dst_inode=$(stat -c '%i' "$dest" 2>/dev/null || stat -f '%i' "$dest" 2>/dev/null || echo "none")
155- if [ "$src_inode" != "$dst_inode" ]; then
156- cp "$f" "$dest"
157- fi
158- done
159- find dist/ -mindepth 1 -maxdepth 1 -type d -delete
149+ # When the artifact name matches the file name, "dist/<name>" already
150+ # exists as a directory — `cp src dist/<name>` then resolves into that
151+ # directory and lands back on the exact same path it started from
152+ # ("same file" error). Stage into a fresh directory and swap it in
153+ # instead of copying file-by-file into the (possibly colliding) dist/.
154+ mkdir -p dist-flat
155+ find dist/ -mindepth 2 -type f -exec cp {} dist-flat/ \;
156+ rm -rf dist
157+ mv dist-flat dist
160158
161159 - name : Install cosign
162160 uses : sigstore/cosign-installer@v3
You can’t perform that action at this time.
0 commit comments