debs/

envoyproxy · Jan 14, 2025 · b852518 · b852518
1 parent 81a685a
commit b852518
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/debs/BUILD b/debs/BUILD
@@ -148,7 +148,7 @@ PUBLISH_ENV = {
     "APTLY_BIN": "$(location @aptly)",
     "MAINTAINER_KEY": "$(location //:envoy-maintainers-public.key)",
     "APTLY_CONF": "$(location //:aptly-config)",
-    "DEBS": "$(location :debs-publish)",
+    "DEBS": "$(locations :debs-publish)",
     "DEBS_ROOT": "$${APT_ROOT}/repository",
     "SIGNING_TOKEN": "$(location :signing-token)",
 }
@@ -180,8 +180,7 @@ HTML_BUILD_CMD = """
 export APTLY_BIN="$(location @aptly)"
 export MAINTAINER_KEY="$(location //:envoy-maintainers-public.key)"
 export APTLY_CONF="$(location //:aptly-config)"
-DEBS="$(dirname $(dirname $(echo $(locations :debs-publish) | cut -d' ' -f1)))"
-export DEBS
+export DEBS="$(locations :debs-publish)"
 export DEBS_ROOT="$${APT_ROOT}/repository"
 export SIGNING_TOKEN="$(location :signing-token)"
 ls -alh /opt/build

diff --git a/debs/publish.sh b/debs/publish.sh
@@ -17,6 +17,10 @@ if [[ -z "$SIGNING_KEY" ]]; then
     exit 1
 fi
 
+if [[ -n "$DEBS" ]]; then
+    DEBS="$(dirname $(dirname $(echo ${DEBS} | cut -d' ' -f1)))"
+fi
+
 
 _aptly () {
     "${APTLY[@]}" -- "${@}"