From 2052b24b4ecff959aa8b5224fe536ab57cdf48e5 Mon Sep 17 00:00:00 2001 From: Ryan Roberts Date: Thu, 14 Nov 2024 17:30:07 +0000 Subject: [PATCH] test: Move assets.yaml to a private config store assets.yaml defines the test components that need to be built for use by test.py. However, it was previously part of the built-in config store so was public to all users. Let's move it to a config store in the test directory and set SHRINKWRAP_CONFIG to point to that store. This makes it private to genassets.sh. Signed-off-by: Ryan Roberts --- test/README.md | 2 +- {config => test/config}/assets.yaml | 0 test/genassets.sh | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) rename {config => test/config}/assets.yaml (100%) diff --git a/test/README.md b/test/README.md index f40263a..6cfe1a3 100644 --- a/test/README.md +++ b/test/README.md @@ -4,5 +4,5 @@ Shrinkwrap must be in the path. crossbuild-essential-arm64 libc6-dev-arm64-cross must be installed. All other dependencies for building linux must be installed. -$ ./assets/genassets.sh +$ ./genassets.sh $ ./test.py diff --git a/config/assets.yaml b/test/config/assets.yaml similarity index 100% rename from config/assets.yaml rename to test/config/assets.yaml diff --git a/test/genassets.sh b/test/genassets.sh index 57539cd..bb3a9b9 100755 --- a/test/genassets.sh +++ b/test/genassets.sh @@ -8,6 +8,7 @@ set -e SOURCE_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) export SHRINKWRAP_BUILD=${SOURCE_DIR}/build export SHRINKWRAP_PACKAGE=${SOURCE_DIR} +export SHRINKWRAP_CONFIG=${SOURCE_DIR}/config export PATH=${PATH}:${SOURCE_DIR}/../shrinkwrap USAGE="$(basename "$0") - A build script to generate test assets/builds -- GitLab