From: romeroalx Date: Fri, 5 Apr 2024 10:02:55 +0000 (+0200) Subject: gh actions - replace yq snap in collect job build-and-test-all X-Git-Tag: rec-5.1.0-alpha1~50^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F14044%2Fhead;p=thirdparty%2Fpdns.git gh actions - replace yq snap in collect job build-and-test-all --- diff --git a/.github/workflows/build-and-test-all.yml b/.github/workflows/build-and-test-all.yml index 4cf2364687..855b90e5ba 100644 --- a/.github/workflows/build-and-test-all.yml +++ b/.github/workflows/build-and-test-all.yml @@ -800,19 +800,19 @@ jobs: uses: coverallsapp/github-action@v2 with: parallel-finished: true - - name: Install jq and yq - run: "sudo snap install jq yq" + - name: Install jq and jc + run: "sudo apt-get update && sudo apt-get install jq jc" - name: Fail job if any of the previous jobs failed - run: "for i in `echo '${{ toJSON(needs) }}' | jq '.[].result' | tr -d '\"'`; do if [[ $i == 'failure' ]]; then echo '${{ toJSON(needs) }}'; exit 1; fi; done;" + run: "for i in `echo '${{ toJSON(needs) }}' | jq -r '.[].result'`; do if [[ $i == 'failure' ]]; then echo '${{ toJSON(needs) }}'; exit 1; fi; done;" - uses: actions/checkout@v4 with: fetch-depth: 5 submodules: recursive ref: ${{ inputs.branch-name }} - name: Get list of jobs in the workflow - run: "yq e '.jobs | keys' .github/workflows/build-and-test-all.yml | awk '{print $2}' | grep -v collect | sort | tee /tmp/workflow-jobs-list.yml" + run: "cat .github/workflows/build-and-test-all.yml | jc --yaml | jq -rS '.[].jobs | keys | .[]' | grep -v collect | 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" + run: "echo '${{ toJSON(needs) }}' | jq -rS 'keys | .[]' | tee /tmp/workflow-needs-list.yml" - name: Fail if there is a job missing on the needs list run: "if ! diff -q /tmp/workflow-jobs-list.yml /tmp/workflow-needs-list.yml; then exit 1; fi"