From f27c039954b8bb462dc9e1b46d0dd30fba4c3c53 Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Fri, 26 Mar 2021 10:06:14 -0700 Subject: [PATCH] refactor: change get_artifacts_url in lib.sh This now looks for the version branch i.e. v3.9.2 to grab the artifacts instead of the head_sha which was faulty in the past. --- ci/lib.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ci/lib.sh b/ci/lib.sh index 764756be4..468b50dd9 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -57,13 +57,16 @@ curl() { # This will contain the artifacts we want. # https://developer.github.com/v3/actions/workflow-runs/#list-workflow-runs get_artifacts_url() { - local head_sha local artifacts_url - head_sha=$(git rev-parse HEAD) - artifacts_url=$(curl -fsSL 'https://api.github.com/repos/cdr/code-server/actions/workflows/ci.yaml/runs?status=success&event=pull_request' | jq -r ".workflow_runs[] | select(.head_sha == \"$head_sha\") | .artifacts_url" | head -n 1) + local workflow_runs_url="https://api.github.com/repos/cdr/code-server/actions/workflows/ci.yaml/runs?status=success&event=pull_request" + # For releases, we look for run based on the branch name v$code_server_version + # example: v3.9.2 + local version_branch="v$VERSION" + artifacts_url=$(curl -fsSL "$workflow_runs_url" | jq -r ".workflow_runs[] | select(.head_branch == \"$version_branch\") | .artifacts_url" | head -n 1) if [[ -z "$artifacts_url" ]]; then echo >&2 "ERROR: artifacts_url came back empty" - echo >&2 "Check the get_artifacts_url function" + echo >&2 "We looked for a successful run triggered by a pull_request with for code-server version: $code_server_version and a branch named $version_branch" + echo >&2 "URL used for curl call: $workflow_runs_url" exit 1 fi