Skip to content

Commit 25f2ec7

Browse files
committed
Use REVISION for branch
Signed-off-by: Sascha Grunert <[email protected]>
1 parent c86b8a3 commit 25f2ec7

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

scripts/oci-artifacts

+7-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ pushd "$ARCHIVE_PATH"
1818
VERSION=v$VERSION
1919
ANNOTATION_VERSION="org.cncf.cri-o.version=$VERSION"
2020
ANNOTATION_COMMIT="org.cncf.cri-o.commit=$COMMIT"
21-
ANNOTATION_BRANCH="org.cncf.cri-o.branch=$PROJECT_VERSION"
21+
ANNOTATION_BRANCH="org.cncf.cri-o.branch=$REVISION"
22+
ANNOTATION_PROJECT="org.cncf.cri-o.project=$PROJECT_VERSION"
2223

2324
TAG_LATEST=
2425
if [[ "$PROJECT_VERSION" == main ]]; then
@@ -64,10 +65,11 @@ for ARCH in "${ARCHES[@]}"; do
6465
-a "$ANNOTATION_VERSION" \
6566
-a "$ANNOTATION_COMMIT" \
6667
-a "$ANNOTATION_BRANCH" \
68+
-a "$ANNOTATION_PROJECT" \
6769
--artifact-type "$BUNDLE_ARTIFACT_TYPE" \
6870
--artifact-platform "linux/$ARCH" \
6971
--format json \
70-
"$TARGET_ARTIFACT,$COMMIT-$ARCH,$VERSION-$ARCH,$PROJECT_VERSION-$ARCH$TAG_LATEST_ARCH" \
72+
"$TARGET_ARTIFACT,$COMMIT-$ARCH,$VERSION-$ARCH,$REVISION-$ARCH,$PROJECT_VERSION-$ARCH$TAG_LATEST_ARCH" \
7173
${ARGS[@]} | jq -r .reference)
7274
cosign sign -y "$ARTIFACT_REF"
7375

@@ -80,7 +82,8 @@ oras manifest index create \
8082
-a "$ANNOTATION_VERSION" \
8183
-a "$ANNOTATION_COMMIT" \
8284
-a "$ANNOTATION_BRANCH" \
83-
"$ARTIFACT:$TAG,$COMMIT,$VERSION,$PROJECT_VERSION$TAG_LATEST" \
85+
-a "$ANNOTATION_PROJECT" \
86+
"$ARTIFACT:$TAG,$COMMIT,$VERSION,$REVISION,$PROJECT_VERSION$TAG_LATEST" \
8487
${ARTIFACTS[@]} | tee -a out
8588
MANIFEST_REF=$(sed -n 's/Digest: //p' out)
8689
cosign sign -y "$ARTIFACT@$MANIFEST_REF"
@@ -92,6 +95,7 @@ for ARCH in "${ARCHES[@]}"; do
9295
-a "$ANNOTATION_VERSION" \
9396
-a "$ANNOTATION_COMMIT" \
9497
-a "$ANNOTATION_BRANCH" \
98+
-a "$ANNOTATION_PROJECT" \
9599
--platform "linux/$ARCH" \
96100
--artifact-type "$SBOM_ARTIFACT_TYPE" \
97101
"$ARTIFACT:$TAG" \

0 commit comments

Comments
 (0)