From ad17b2c474fa9abc1d40f68a00844b8b8c7846f6 Mon Sep 17 00:00:00 2001 From: Russ Magee Date: Mon, 8 Dec 2025 22:32:49 -0800 Subject: [PATCH] Reverted ci script to master version --- bacillus/ci_pushbuild.sh | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/bacillus/ci_pushbuild.sh b/bacillus/ci_pushbuild.sh index e090433..aa4bc7e 100755 --- a/bacillus/ci_pushbuild.sh +++ b/bacillus/ci_pushbuild.sh @@ -25,8 +25,15 @@ echo "Building most recent push on branch $branch" git checkout "$branch" ls -go mod init blitter.com/go/xs -go mod tidy +#!############ +#!stage "GoMod" +#!############ +#!go clean -modcache +#! +#!rm -f go.{mod,sum} +#!go mod init blitter.com/go/xs +#!go mod tidy +#!echo "---" ############ stage "Build" @@ -35,16 +42,19 @@ echo "Invoking 'make clean' ..." make clean echo "Invoking 'make all' ..." make all +echo "---" ############ stage "Lint" ############ make lint +echo "---" ############ stage "UnitTests" ############ go test -v . +echo "---" ############ stage "Test(Authtoken)" @@ -64,6 +74,7 @@ else echo "client cmd performed OK." unset tokentest fi +echo "---" ############ stage "Test(xc S->C)" @@ -88,6 +99,7 @@ else echo "FAILED!" exit $stat fi +echo "---" ############ stage "Test(xc C->S)" @@ -98,12 +110,14 @@ if [ -f ~/.config/xs/.xs_id.bak ]; then echo "Restoring test user $USER .xs_id file ..." mv ~/.config/xs/.xs_id.bak ~/.config/xs/.xs_id fi +echo "---" ############ stage "Artifacts" ############ echo -n "Creating tarfile ..." tar -cz --exclude=.git --exclude=cptest -f ${BACILLUS_ARTFDIR}/xs.tgz . +echo "---" ############ stage "Cleanup"