Russtopia/bacillus
1
0
Fork 0
mirror of http://gogs.blitter.com:3000/Russtopia/bacillus.git synced 2024-06-18 23:07:10 +00:00
Code Issues Projects Releases Wiki Activity

Added -v option (version+gitCommit)

Browse Source 
Removed double-quotes around parameterized job arguments

Signed-off-by: Russ Magee <rmagee@gmail.com>
This commit is contained in:
Russ Magee 2019-11-11 16:46:11 -08:00
parent e78d62bcb4
commit cb5e2cd6ff
3 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,6 +1,6 @@
MAKEOPTS = $(MAKEOPTS)
GIT_COMMIT := $(shell git rev-list -1 HEAD)
VERSION := 0.2.3
VERSION := 0.2.4
BUILDOPTS :=$(BUILDOPTS) -ldflags "-X main.version=$(VERSION) -X main.gitCommit=$(GIT_COMMIT)"
.PHONY: install all clean

9
bacillus.go
View File

@ -1114,7 +1114,7 @@ func launchJobListener(mainCtx context.Context, cmd, jobTag, jobOpts string, job
r.ParseForm() //nolint:errcheck
for k, v := range r.Form {
if len(v) > 0 {
jobEnv = append(jobEnv, k+`="`+v[0]+`"`)
jobEnv = append(jobEnv, k+`=`+v[0])
}
}
bodyFragM = fmt.Sprintf("<pre>Triggered parameterized build %s</pre>\n", jobTag)
@ -1437,6 +1437,7 @@ func patchLiveViewOfRunLogEntries(orig []string, horizon int) (fixed []string) {
func main() {
var createRunlog bool
var versionFlag bool
flag.StringVar(&addrPort, "a", ":9990", "[addr]:port on which to listen")
flag.BoolVar(&basicAuth, "auth", true, "enable basic http auth login (be sure to also set -u and -p)")
@ -1450,8 +1451,14 @@ func main() {
flag.BoolVar(&attachStdout, "s", false, "set to true to see worker stdout/err if running in terminal")
flag.BoolVar(&showStagesOnFinished, "F", false, "set to true to show stages on finished jobs in runlog")
flag.BoolVar(&demoMode, "D", false, "set true/1 to enable public demo mode -- users cannot /shutdown or /rudeshutdown")
flag.BoolVar(&versionFlag, "v", false, "print version")
flag.Parse()
if versionFlag {
fmt.Println("v" + version + "_" + gitCommit[:5])
os.Exit(0)
}
killSwitch = make(chan bool, 1) // ensure a single send can proceed unblocked
mainCtx := context.Background()

26
example_workdir/artifact.sh
View File

@ -34,40 +34,38 @@ function stage {
fi
}
delay=${1:-"5"}
stage "Setup"
echo "workdir: ${PWD}"
env
stage "Busywork"
for i in $(seq 1 4); do
echo "Doing some work (sleeping ${delay}). $i ..."
sleep ${delay}
echo "Doing some work (sleeping ${DELAY}). $i ..."
sleep ${DELAY}
done
stage "S1"
for i in $(seq 1 4); do
echo "Doing some work (sleeping ${delay}). $i ..."
sleep ${delay}
echo "Doing some work (sleeping ${DELAY}). $i ..."
sleep ${DELAY}
done
stage "S2"
for i in $(seq 1 4); do
echo "Doing some work (sleeping ${delay}). $i ..."
sleep ${delay}
echo "Doing some work (sleeping ${DELAY}). $i ..."
sleep ${DELAY}
done
stage "S3"
for i in $(seq 1 4); do
echo "Doing some work (sleeping ${delay}). $i ..."
sleep ${delay}
echo "Doing some work (sleeping ${DELAY}). $i ..."
sleep ${DELAY}
done
stage "S4"
for i in $(seq 1 4); do
echo "Doing some work (sleeping ${delay}). $i ..."
sleep ${delay}
echo "Doing some work (sleeping ${DELAY}). $i ..."
sleep ${DELAY}
done
stage "Artifacts"
@ -77,8 +75,8 @@ echo "blah" >"${ADIR}/artifact.txt"
stage "Post Processing"
for i in $(seq 1 4); do
echo "Doing some work (sleeping ${delay}). $i ..."
sleep ${delay}
echo "Doing some work (sleeping ${DELAY}). $i ..."
sleep ${DELAY}
done