From d5961549ba216b7beb3744322e76e6063ab98860 Mon Sep 17 00:00:00 2001 From: juacrumar Date: Wed, 17 Mar 2021 15:46:52 +0100 Subject: [PATCH 1/3] update reference and add check --- .github/workflows/rules.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/rules.yml b/.github/workflows/rules.yml index fa7956f2a6..43be812fac 100644 --- a/.github/workflows/rules.yml +++ b/.github/workflows/rules.yml @@ -10,7 +10,7 @@ on: env: N3FIT_MAXNREP: 20 # total number of replicas to fit POSTFIT_NREP: 16 # requested replicas for postfit - REFERENCE_SET: NNBOT-40696977-2021-01-28 # reference set for vp + REFERENCE_SET: NNBOT-1cf8d4e11-2021-03-12 # reference set for vp CONDA_PY: 37 jobs: @@ -67,8 +67,13 @@ jobs: source activate nnpdfenv cd n3fit/runcards postfit $POSTFIT_NREP $RUNCARD - url=$(vp-upload $RUNCARD 2>&1 | grep https) - sleep 10s + res=$(vp-upload $RUNCARD 2>&1) + while echo ${res} | grep ERROR >/dev/null + do + sleep 30s + res=$(vp-upload $RUNCARD 2>&1 | grep https) + enddo + url=$( echo "${res}" | grep https ) echo "FIT_URL=$url" >> $GITHUB_ENV # running validphys report - name: Building and upload report From d29dd53141bd967a487a5d8cdf60b29be23fab59 Mon Sep 17 00:00:00 2001 From: Juacrumar Date: Wed, 17 Mar 2021 15:50:06 +0100 Subject: [PATCH 2/3] Update rules.yml --- .github/workflows/rules.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rules.yml b/.github/workflows/rules.yml index 43be812fac..0bf0b19cc5 100644 --- a/.github/workflows/rules.yml +++ b/.github/workflows/rules.yml @@ -71,7 +71,7 @@ jobs: while echo ${res} | grep ERROR >/dev/null do sleep 30s - res=$(vp-upload $RUNCARD 2>&1 | grep https) + res=$(vp-upload $RUNCARD 2>&1) enddo url=$( echo "${res}" | grep https ) echo "FIT_URL=$url" >> $GITHUB_ENV From ac177d49442fba932e511568ff9ecaa8e7964e88 Mon Sep 17 00:00:00 2001 From: Juacrumar Date: Wed, 17 Mar 2021 22:51:23 +0100 Subject: [PATCH 3/3] fortran hands... --- .github/workflows/rules.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rules.yml b/.github/workflows/rules.yml index 0bf0b19cc5..f0b8b41bc4 100644 --- a/.github/workflows/rules.yml +++ b/.github/workflows/rules.yml @@ -72,7 +72,7 @@ jobs: do sleep 30s res=$(vp-upload $RUNCARD 2>&1) - enddo + done url=$( echo "${res}" | grep https ) echo "FIT_URL=$url" >> $GITHUB_ENV # running validphys report