From 0018baf835be034ac9abfbddda0dc2b89a457eba Mon Sep 17 00:00:00 2001 From: romeroalx Date: Fri, 5 Apr 2024 12:02:55 +0200 Subject: [PATCH] gh actions - replace yq snap in collect job build-and-test-all (cherry picked from commit 3a5fb2cb7e890e1ebb0e0e75f6349640fc76f878) --- .github/workflows/build-and-test-all.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-and-test-all.yml b/.github/workflows/build-and-test-all.yml index 1973183789..bc876c6006 100644 --- a/.github/workflows/build-and-test-all.yml +++ b/.github/workflows/build-and-test-all.yml @@ -166,19 +166,19 @@ jobs: if: success() || failure() runs-on: ubuntu-22.04 steps: - - 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;" - - uses: actions/checkout@v3 + 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" -- 2.47.2