From 60286c6bb8a9f9ec21f0097530ccd39c9fc44930 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Sat, 24 Mar 2018 13:51:14 +0100
Subject: [PATCH] improve curl invocations; fix timing submission
---
buildjob | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/buildjob b/buildjob
index d2374da..41d437f 100755
--- a/buildjob
+++ b/buildjob
@@ -37,15 +37,15 @@ if [[ -n "$VALIDATE" ]]; then
fi
# maybe submit timing information
-if [[ -n "$TIMING_CONF" ]]; then
+if [[ -n "$TIMING_PROJECT" && -n "$TIMING_CONF" ]]; then
echo_color "$BOLDGREEN" "[buildjob] Submitting timing information to coq-speed"
# check if we have the secret
if [[ -z "$TIMING_SECRET" ]]; then
echo_color "$BOLDRED" "[buildjob] TIMING_SECRET variable is missing"
fi
# Submit to webhook endpoint
- curl --fail -X POST https://coq-speed.mpi-sws.org/webhook/build_times \
- --user "$TIMING_SECRET"
+ curl --fail -sS -X POST https://coq-speed.mpi-sws.org/webhook/build_times \
+ --user "$TIMING_SECRET" \
-H "X-Commit: $CI_COMMIT_SHA" \
-H "X-Project: $TIMING_PROJECT" \
-H "X-Branch: $CI_COMMIT_REF_NAME" \
@@ -68,7 +68,7 @@ if [[ -n "$OPAM_PKG" && "$CI_COMMIT_REF_NAME" == "$MAIN_BRANCH" ]]; then
OPAM_PKG_PREFIX="branch.$CI_COMMIT_REF_NAME"
fi
# Trigger opam updater
- curl --fail -X POST https://gitlab.mpi-sws.org/api/v4/projects/581/trigger/pipeline \
+ curl --fail -sS -X POST https://gitlab.mpi-sws.org/api/v4/projects/581/trigger/pipeline \
-F "token=$OPAM_UPDATE_SECRET" \
-F "ref=master" \ # the branch we trigger on the other end
-F "variables[REPO]=$CI_PROJECT_URL.git" \
--
GitLab