diff --git a/Jenkinsfile.deploy b/Jenkinsfile.deploy index ed65687..7d0484a 100644 --- a/Jenkinsfile.deploy +++ b/Jenkinsfile.deploy @@ -61,7 +61,7 @@ node('put-shared') { ansiColor('xterm') { sh '''#!/usr/bin/env bash set -Eeuo pipefail -x - jq -L.scripts ' + jq -L.scripts --tab ' include "deploy"; arch_tagged_manifests(env.BASHBREW_ARCH) | deploy_objects[] @@ -74,7 +74,7 @@ node('put-shared') { ansiColor('xterm') { wget --timeout=5 -qO past-deploy.json "$JOB_URL/lastSuccessfulBuild/artifact/deploy.json" # swap to this touch instead of the wget above to (re)bootstrap #touch past-deploy.json - jq --slurpfile past ./past-deploy.json 'select( IN($past[]) | not )' ./deploy.json > filtered-deploy.json + jq --tab --slurpfile past ./past-deploy.json 'select( IN($past[]) | not )' ./deploy.json > filtered-deploy.json ''' } stage('Archive') { diff --git a/Jenkinsfile.trigger b/Jenkinsfile.trigger index f48170a..8299d65 100644 --- a/Jenkinsfile.trigger +++ b/Jenkinsfile.trigger @@ -213,7 +213,7 @@ node { sh '''#!/usr/bin/env bash set -Eeuo pipefail -x - jq <<<"$currentJobsJson" ' + jq <<<"$currentJobsJson" --tab ' # merge the two objects recursively, preferring data from "buildCompletionDataJson" . * ( env.buildCompletionDataJson | fromjson ) # save firstTime if it is not set yet diff --git a/doi.jq b/doi.jq index 35605ca..e5cfe4b 100644 --- a/doi.jq +++ b/doi.jq @@ -152,7 +152,7 @@ def buildkit_provenance_builder_id: # output: boolean def build_should_sbom: # see "bashbrew remote arches docker/scout-sbom-indexer:1" (we need the SBOM scanner to be runnable on the host architecture) - # bashbrew remote arches --json docker/scout-sbom-indexer:1 | jq '.arches | keys_unsorted' -c + # bashbrew remote arches --json docker/scout-sbom-indexer:1 | jq '.arches | keys_unsorted' --compact-output ( .build.arch as $arch | ["amd64","arm32v5","arm32v7","arm64v8","i386","ppc64le","riscv64","s390x"] | index($arch) ) and (