comments, first pass

This commit is contained in:
tooomm 2026-08-04 22:18:27 +02:00
parent c01f7308da
commit 2858450d7f
2 changed files with 9 additions and 8 deletions

View file

@ -95,7 +95,7 @@ jobs:
org.opencontainers.image.description=${{ env.OCI_DESCRIPTION }} org.opencontainers.image.description=${{ env.OCI_DESCRIPTION }}
org.opencontainers.image.title=${{ env.OCI_TITLE }} org.opencontainers.image.title=${{ env.OCI_TITLE }}
org.opencontainers.image.url=${{ env.OCI_URL }} org.opencontainers.image.url=${{ env.OCI_URL }}
outputs: type=image,push-by-digest=true,name-canonical=true,push=true outputs: type=image,name=${{ env.GHCR_IMAGE }},name-canonical=true,push=true,push-by-digest=true
platforms: ${{ matrix.platform }} platforms: ${{ matrix.platform }}
provenance: mode=max # Do not pass secrets as build arguments with this option provenance: mode=max # Do not pass secrets as build arguments with this option
sbom: true sbom: true
@ -113,7 +113,7 @@ jobs:
uses: actions/upload-artifact@v7 uses: actions/upload-artifact@v7
with: with:
if-no-files-found: error if-no-files-found: error
name: digest-${{ matrix.platform }} name: digest-${{ matrix.label }}
path: $RUNNER_TEMP/digests/* path: $RUNNER_TEMP/digests/*
retention-days: 1 retention-days: 1
@ -127,7 +127,7 @@ jobs:
steps: steps:
- name: "Download digests" - name: "Download digests"
uses: actions/download-artifact@v4 uses: actions/download-artifact@v7
with: with:
path: $RUNNER_TEMP/digests path: $RUNNER_TEMP/digests
pattern: digest-* pattern: digest-*
@ -152,11 +152,12 @@ jobs:
# Add OCI annotations to image index and publish tags # Add OCI annotations to image index and publish tags
- name: "Create image index" - name: "Create image index"
env: env:
TAGS: ${{ steps.metadata.outputs.tags }} DOCKER_TAGS: ${{ steps.metadata.outputs.tags }}
GITHUB_TAG: ${{ github.ref_name }}
working-directory: ${{ runner.temp }}/digests working-directory: ${{ runner.temp }}/digests
run: | run: |
TAG_ARGS="" TAG_ARGS=""
for tag in $TAGS; do for tag in $DOCKER_TAGS; do
TAG_ARGS="$TAG_ARGS --tag $tag" TAG_ARGS="$TAG_ARGS --tag $tag"
done done
@ -171,4 +172,4 @@ jobs:
- name: "Inspect images" - name: "Inspect images"
run: | run: |
docker buildx imagetools inspect "$GHCR_IMAGE:latest" docker buildx imagetools inspect "$GHCR_IMAGE:latest"
docker buildx imagetools inspect "$GHCR_IMAGE:$OCI_VERSION" docker buildx imagetools inspect "$GHCR_IMAGE:$GITHUB_TAG"

View file

@ -23,11 +23,11 @@ WORKDIR /src
COPY . . COPY . .
RUN cmake \ RUN cmake \
-S . \ -S . \
-B build \ -B build \
-G Ninja \ -G Ninja \
-DWITH_SERVER=1 \
-DWITH_CLIENT=0 \ -DWITH_CLIENT=0 \
-DWITH_ORACLE=0 \ -DWITH_ORACLE=0 \
-DWITH_SERVER=1 \
&& cmake --build build \ && cmake --build build \
&& cmake --install build && cmake --install build