Skip to content
Merged
Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion builder/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -106,5 +106,5 @@ $(foreach artifact_rule,$(shell ./make_get_artifact_rules),$(eval $(call artifac
ln -f -s -r '$<' '.build/$*'

# prevents match anything rule from applying to Makefile and image/convert scripts
Makefile image image.release image.manifest image.sbom image.sourcemanifest image.requirements $(shell find features -name 'convert.*' -o -name image -o -name 'image.*'):
Makefile image image.release image.manifest image.sbom image.requirements $(shell find features -name 'convert.*' -o -name image -o -name 'image.*'):
true
17 changes: 0 additions & 17 deletions builder/image.sourcemanifest

This file was deleted.

2 changes: 1 addition & 1 deletion builder/make_get_artifact_rules
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -euo pipefail
shopt -s nullglob

extensions=(release manifest sbom sourcemanifest requirements raw)
extensions=(release manifest sbom requirements raw)

for feature in "features/"*; do
for i in "$feature/"{image,convert}.*; do
Expand Down
4 changes: 2 additions & 2 deletions builder/make_list_build_artifacts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ cname="$1"

IFS=',' read -r -a features < <(./parse_features --allow-frankenstein --feature-dir features --cname "$cname" features)

artifacts=(".build/$cname-$COMMIT.tar" ".build/$cname-$COMMIT.release" ".build/$cname-$COMMIT.manifest" ".build/$cname-$COMMIT.sbom" ".build/$cname-$COMMIT.sourcemanifest" ".build/$cname-$COMMIT.requirements")
artifacts=(".build/$cname-$COMMIT.tar" ".build/$cname-$COMMIT.release" ".build/$cname-$COMMIT.manifest" ".build/$cname-$COMMIT.sbom" ".build/$cname-$COMMIT.requirements")

for feature in "${features[@]}"; do
for i in "features/$feature/"{image,convert}.*; do
Expand All @@ -18,7 +18,7 @@ for feature in "${features[@]}"; do
done
done

if [ "${#artifacts[@]}" = 6 ] && [ -n "$(./parse_features --allow-frankenstein --feature-dir "features" --cname "$cname" platforms)" ]; then
if [ "${#artifacts[@]}" = 5 ] && [ -n "$(./parse_features --allow-frankenstein --feature-dir "features" --cname "$cname" platforms)" ]; then
artifacts+=(".build/$cname-$COMMIT.raw")
fi

Expand Down
Loading