Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ jobs:
id: build
uses: ./.github/actions/build-image
with:
version: ${{ needs.validate.outputs.version }}
version: ${{ needs.validate.outputs.publish_version }}
arch: ${{ matrix.arch }}
release-date: ${{ needs.validate.outputs.release_date }}
release-url: ${{ needs.validate.outputs.release_url }}
Expand All @@ -510,15 +510,15 @@ jobs:
- name: Run image tests
uses: ./.github/actions/test-image
with:
image-tag: ${{ needs.validate.outputs.version }}-${{ matrix.arch }}
image-tag: ${{ needs.validate.outputs.publish_version }}-${{ matrix.arch }}
image-source: tar
tar-file: /tmp/image.tar
ref: ${{ needs.finalize.outputs.finalize_sha }}

- name: Run integration tests
uses: ./.github/actions/test-integration
with:
image-tag: ${{ needs.validate.outputs.version }}-${{ matrix.arch }}
image-tag: ${{ needs.validate.outputs.publish_version }}-${{ matrix.arch }}
ref: ${{ needs.finalize.outputs.finalize_sha }}

- name: Scan image for vulnerabilities
Expand All @@ -535,7 +535,7 @@ jobs:
- name: Upload tested image
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
with:
name: container-image-${{ needs.validate.outputs.version }}-${{ matrix.arch }}
name: container-image-${{ needs.validate.outputs.publish_version }}-${{ matrix.arch }}
path: /tmp/image.tar
retention-days: 1
compression-level: 0
Expand Down Expand Up @@ -617,11 +617,11 @@ jobs:
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
with:
path: /tmp/images
pattern: container-image-${{ needs.validate.outputs.version }}-*
pattern: container-image-${{ needs.validate.outputs.publish_version }}-*

- name: Load and push images
env:
BASE_VERSION: ${{ needs.validate.outputs.version }}
BUILD_VERSION: ${{ needs.validate.outputs.publish_version }}
PUBLISH_VERSION: ${{ needs.validate.outputs.publish_version }}
ARCHS: ${{ needs.validate.outputs.architectures }}
run: |
Expand All @@ -631,7 +631,7 @@ jobs:
IFS=' ' read -ra ARCH_ARRAY <<< "$ARCHS"

for arch in "${ARCH_ARRAY[@]}"; do
ARTIFACT_PATH="/tmp/images/container-image-${BASE_VERSION}-${arch}"
ARTIFACT_PATH="/tmp/images/container-image-${BUILD_VERSION}-${arch}"

if [ ! -f "$ARTIFACT_PATH/image.tar" ]; then
echo "ERROR: Artifact not found: $ARTIFACT_PATH/image.tar"
Expand All @@ -642,7 +642,7 @@ jobs:
echo "Loading $arch image..."
docker load < "$ARTIFACT_PATH/image.tar"

SOURCE_IMAGE_TAG="$REPO:$BASE_VERSION-$arch"
SOURCE_IMAGE_TAG="$REPO:$BUILD_VERSION-$arch"
IMAGE_TAG="$REPO:$PUBLISH_VERSION-$arch"
docker tag "$SOURCE_IMAGE_TAG" "$IMAGE_TAG"
echo "Pushing $arch image: $IMAGE_TAG"
Expand Down
Loading