Skip to content

Commit 49001f6

Browse files
Fix not detecting rc release in sign and package
1 parent db0f7cf commit 49001f6

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

.github/workflows/cicd.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -339,69 +339,69 @@ jobs:
339339
TAG=${{ env.TAG }}
340340
MAJOR_TAG=$(echo $TAG | cut -d. -f1)
341341
MINOR_TAG=$(echo $TAG | cut -d. -f1,2)
342-
342+
343343
echo "Waiting for multi-arch manifests to be ready..."
344344
sleep 30
345-
345+
346346
# Determine if this is an RC release
347347
IS_RC="false"
348-
if echo "$TAG" | grep -qE "rc[0-9]+$"; then
348+
if [[ "$TAG" == *"-rc."* ]]; then
349349
IS_RC="true"
350350
fi
351-
351+
352352
if [ "$IS_RC" = "true" ]; then
353353
echo "RC release detected - copying version-specific tags only"
354-
354+
355355
# SQLite OSS
356356
echo "Copying ${{ env.DOCKERHUB_IMAGE }}:${TAG} -> ${{ env.GHCR_IMAGE }}:${TAG}"
357357
skopeo copy --all --retry-times 3 \
358358
docker://$DOCKERHUB_IMAGE:$TAG \
359359
docker://$GHCR_IMAGE:$TAG
360-
360+
361361
# PostgreSQL OSS
362362
echo "Copying ${{ env.DOCKERHUB_IMAGE }}:postgresql-${TAG} -> ${{ env.GHCR_IMAGE }}:postgresql-${TAG}"
363363
skopeo copy --all --retry-times 3 \
364364
docker://$DOCKERHUB_IMAGE:postgresql-$TAG \
365365
docker://$GHCR_IMAGE:postgresql-$TAG
366-
366+
367367
# SQLite Enterprise
368368
echo "Copying ${{ env.DOCKERHUB_IMAGE }}:ee-${TAG} -> ${{ env.GHCR_IMAGE }}:ee-${TAG}"
369369
skopeo copy --all --retry-times 3 \
370370
docker://$DOCKERHUB_IMAGE:ee-$TAG \
371371
docker://$GHCR_IMAGE:ee-$TAG
372-
372+
373373
# PostgreSQL Enterprise
374374
echo "Copying ${{ env.DOCKERHUB_IMAGE }}:ee-postgresql-${TAG} -> ${{ env.GHCR_IMAGE }}:ee-postgresql-${TAG}"
375375
skopeo copy --all --retry-times 3 \
376376
docker://$DOCKERHUB_IMAGE:ee-postgresql-$TAG \
377377
docker://$GHCR_IMAGE:ee-postgresql-$TAG
378378
else
379379
echo "Regular release detected - copying all tags (latest, major, minor, full version)"
380-
380+
381381
# SQLite OSS - all tags
382382
for TAG_SUFFIX in "latest" "$MAJOR_TAG" "$MINOR_TAG" "$TAG"; do
383383
echo "Copying ${{ env.DOCKERHUB_IMAGE }}:${TAG_SUFFIX} -> ${{ env.GHCR_IMAGE }}:${TAG_SUFFIX}"
384384
skopeo copy --all --retry-times 3 \
385385
docker://$DOCKERHUB_IMAGE:$TAG_SUFFIX \
386386
docker://$GHCR_IMAGE:$TAG_SUFFIX
387387
done
388-
388+
389389
# PostgreSQL OSS - all tags
390390
for TAG_SUFFIX in "latest" "$MAJOR_TAG" "$MINOR_TAG" "$TAG"; do
391391
echo "Copying ${{ env.DOCKERHUB_IMAGE }}:postgresql-${TAG_SUFFIX} -> ${{ env.GHCR_IMAGE }}:postgresql-${TAG_SUFFIX}"
392392
skopeo copy --all --retry-times 3 \
393393
docker://$DOCKERHUB_IMAGE:postgresql-$TAG_SUFFIX \
394394
docker://$GHCR_IMAGE:postgresql-$TAG_SUFFIX
395395
done
396-
396+
397397
# SQLite Enterprise - all tags
398398
for TAG_SUFFIX in "latest" "$MAJOR_TAG" "$MINOR_TAG" "$TAG"; do
399399
echo "Copying ${{ env.DOCKERHUB_IMAGE }}:ee-${TAG_SUFFIX} -> ${{ env.GHCR_IMAGE }}:ee-${TAG_SUFFIX}"
400400
skopeo copy --all --retry-times 3 \
401401
docker://$DOCKERHUB_IMAGE:ee-$TAG_SUFFIX \
402402
docker://$GHCR_IMAGE:ee-$TAG_SUFFIX
403403
done
404-
404+
405405
# PostgreSQL Enterprise - all tags
406406
for TAG_SUFFIX in "latest" "$MAJOR_TAG" "$MINOR_TAG" "$TAG"; do
407407
echo "Copying ${{ env.DOCKERHUB_IMAGE }}:ee-postgresql-${TAG_SUFFIX} -> ${{ env.GHCR_IMAGE }}:ee-postgresql-${TAG_SUFFIX}"
@@ -410,7 +410,7 @@ jobs:
410410
docker://$GHCR_IMAGE:ee-postgresql-$TAG_SUFFIX
411411
done
412412
fi
413-
413+
414414
echo "All images copied successfully to GHCR!"
415415
shell: bash
416416

@@ -490,11 +490,11 @@ jobs:
490490
--certificate-oidc-issuer "${issuer}" \
491491
--certificate-identity-regexp "${id_regex}" \
492492
"${REF}" -o text
493-
493+
494494
echo "✓ Successfully signed and verified ${BASE_IMAGE}:${IMAGE_TAG}"
495495
done
496496
done
497-
497+
498498
echo "All images signed and verified successfully!"
499499
shell: bash
500500

0 commit comments

Comments
 (0)