From d0c76518641facd6fa1f5da61f64c8423c2d3cc4 Mon Sep 17 00:00:00 2001 From: andreas Date: Mon, 2 Oct 2023 20:38:15 +0200 Subject: [PATCH] correct yaml error, better error handling --- .circleci/config.yml | 8 ++++---- webinstall/cibuild.js | 2 +- webinstall/cibuild.php | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3fb5c52..7a14259 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -72,7 +72,7 @@ workflows: when: << pipeline.parameters.run_build >> jobs: - pio-build - # set the filter to allow a build for any sha tag - filters: - tags: - only: /.*/ + # set the filter to allow a build for any sha tag + filters: + tags: + only: /.*/ diff --git a/webinstall/cibuild.js b/webinstall/cibuild.js index 5143c7a..3ed336a 100644 --- a/webinstall/cibuild.js +++ b/webinstall/cibuild.js @@ -80,7 +80,7 @@ import fileDownload from "https://cdn.skypack.dev/js-file-download@0.4.12" setValues(st); setVisible('status_url',st.status_url !== undefined,true); setVisible('error',st.error !== undefined,true); - if (st.status === 'error'){ + if (st.status === 'error' || st.state === 'errored'){ setRunning(false); setVisible('download',false,true); return; diff --git a/webinstall/cibuild.php b/webinstall/cibuild.php index 89c4f29..2e0280a 100644 --- a/webinstall/cibuild.php +++ b/webinstall/cibuild.php @@ -65,7 +65,7 @@ function getJobStatus($pipeline,$wf=workflowName,$job=jobName){ if (! isset($pstat['state'])){ throw new Exception("state not set"); } - if ($pstat['state'] != 'created'){ + if ($pstat['state'] == 'created'){ return $pstat; } $pipeline_id=$pstat['id'];