From ee541815032ecc3af2bc79cb1e435b4d1fab749f Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Wed, 6 Sep 2017 18:00:47 -0700 Subject: [PATCH] build_torcx_store: upload manifests to upload_root Rather than to a location special to them. The comment in the code explains the reasoning for this. --- build_torcx_store | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/build_torcx_store b/build_torcx_store index 7a2de8451f..8099f45d97 100755 --- a/build_torcx_store +++ b/build_torcx_store @@ -251,9 +251,16 @@ for pkg in $(torcx_manifest::get_pkg_names "${manifest_path}"); do done # Upload the manifest +# Note: the manifest is uploaded to 'UPLOAD_ROOT' rather than +# 'TORCX_UPLOAD_ROOT'. +# For non-release builds, those two locations will be the same, so it usually +# won't matter. +# However, for release builds, torcx packages may be uploaded directly to their +# final location, while the manifest still has to go through build bucket in +# order to get signed. sign_and_upload_files \ 'torcx manifest' \ - "${TORCX_UPLOAD_ROOT}/manifests/${BOARD}/${COREOS_VERSION}" \ + "${UPLOAD_ROOT}/torcx/manifests/${BOARD}/${COREOS_VERSION}" \ "" \ "${manifest_path}"