From: Peter van Dijk Date: Fri, 3 May 2024 13:32:48 +0000 (+0200) Subject: undo merge damage to unbreak collect X-Git-Tag: auth-4.9.1~19^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac27a5b1807b41ce46d837888bda94bb82da6ef0;p=thirdparty%2Fpdns.git undo merge damage to unbreak collect --- diff --git a/.github/workflows/build-and-test-all.yml b/.github/workflows/build-and-test-all.yml index 9821384b7a..d0652df719 100644 --- a/.github/workflows/build-and-test-all.yml +++ b/.github/workflows/build-and-test-all.yml @@ -436,7 +436,7 @@ jobs: submodules: recursive ref: ${{ inputs.branch-name }} - name: Get list of jobs in the workflow - run: "cat .github/workflows/build-and-test-all.yml | jc --yaml | jq -rS '.[].jobs | keys | .[]' | grep -vE 'collect|get-runner-container-image' | tee /tmp/workflow-jobs-list.yml" + run: "yq e '.jobs | keys' .github/workflows/build-and-test-all.yml | awk '{print $2}' | grep -vE 'collect|get-runner-container-image' | sort | tee /tmp/workflow-jobs-list.yml" - name: Get list of prerequisite jobs run: "echo '${{ toJSON(needs) }}' | jq 'keys | .[]' | tr -d '\"' | sort | tee /tmp/workflow-needs-list.yml" - name: Fail if there is a job missing on the needs list