From 917d1a5c27f6a17264ee8f739219a2185ba1423a Mon Sep 17 00:00:00 2001 From: Jared Allard Date: Tue, 20 Feb 2024 16:46:27 -0800 Subject: [PATCH] ci: generate thin manifests, fix linter w/ multiple ebuilds --- .tools/internal/ebuild/embed/verify-manifest.sh | 4 +++- .tools/internal/steps/embed/generate-manifest.sh | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.tools/internal/ebuild/embed/verify-manifest.sh b/.tools/internal/ebuild/embed/verify-manifest.sh index 893c5db..f5b918d 100644 --- a/.tools/internal/ebuild/embed/verify-manifest.sh +++ b/.tools/internal/ebuild/embed/verify-manifest.sh @@ -61,7 +61,9 @@ validate_ebuild_manifest() { info "Validating Manifest" pushd "$workPath" >/dev/null || return 1 - ebuild --color y "$(ls -1 ./*.ebuild)" manifest + for ebuild in *.ebuild; do + ebuild --color y "$ebuild" manifest + done if [[ ! -e "Manifest" ]] && [[ ! -e "$srcPath/Manifest" ]]; then info "No Manifest in source directory or generated by ebuild command." \ diff --git a/.tools/internal/steps/embed/generate-manifest.sh b/.tools/internal/steps/embed/generate-manifest.sh index f725e81..e93c356 100644 --- a/.tools/internal/steps/embed/generate-manifest.sh +++ b/.tools/internal/steps/embed/generate-manifest.sh @@ -31,6 +31,14 @@ MANIFEST_WRITE_PATH="/.well-known/Manifest" portdir="/src/fake_portdir/$EBUILD_NAME" mkdir -p "$portdir" +mkdir -p "$portdir/metadata" +# TODO(jaredallard): This should match the repo. +cat >"$portdir/metadata/layout.conf" </dev/null || exit 1 ebuild_path="$(basename "$EBUILD_NAME")-$EBUILD_LATEST_VERSION.ebuild" cp "$EBUILD_PATH" "$ebuild_path"