This is an automated email from the ASF dual-hosted git repository.
zrhoffman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new 9f02eeb622 Fix Pkg Build Order to Mirror docker-compose.yml (#6974)
9f02eeb622 is described below
commit 9f02eeb622908b1a0c2db35142fb92b77bf1a7f1
Author: Steve Hamrick <[email protected]>
AuthorDate: Wed Jul 20 13:28:21 2022 -0600
Fix Pkg Build Order to Mirror docker-compose.yml (#6974)
* Fix pkg build order to mirror docker-compose.yml
* Rearrange input instead of assuming docker-compose.yml syntax
* Add comment
---
pkg | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/pkg b/pkg
index c6fcdb37b4..e7c2d4141e 100755
--- a/pkg
+++ b/pkg
@@ -155,7 +155,9 @@ while getopts h78abdf:lopqvsSL opt; do
esac
done
-PROJECTS="$("${COMPOSECMD[@]}" -f $COMPOSE_FILE config --services)"
+# Weasel must be built first otherwise it will fail from build artifacts/cache
in an environment that doesn't have git
+# e.g. the environment produced by `./pkg source`.
+PROJECTS="weasel"$'\n'"$("${COMPOSECMD[@]}" -f $COMPOSE_FILE config --services
| sed '/^weasel$/d')"
HELP_TEXT="$(cat <<HELP_TEXT
Usage: $SELF [options] [projects]
-7 Build RPMs targeting CentOS 7
