Skip to content

Commit 48886c1

Browse files
authored
Fix a few more cases of --tab that I missed (#143)
* Add `--tab` to invocations in `Jenkinsfile.deploy` * Add `--tab` to another invocation in `Jenkinsfile.trigger` * Expand `-c` in `doi.jq` comment
1 parent 4c8c234 commit 48886c1

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Jenkinsfile.deploy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ node('put-shared') { ansiColor('xterm') {
6161
sh '''#!/usr/bin/env bash
6262
set -Eeuo pipefail -x
6363

64-
jq -L.scripts '
64+
jq -L.scripts --tab '
6565
include "deploy";
6666
arch_tagged_manifests(env.BASHBREW_ARCH)
6767
| deploy_objects[]
@@ -74,7 +74,7 @@ node('put-shared') { ansiColor('xterm') {
7474
wget --timeout=5 -qO past-deploy.json "$JOB_URL/lastSuccessfulBuild/artifact/deploy.json"
7575
# swap to this touch instead of the wget above to (re)bootstrap
7676
#touch past-deploy.json
77-
jq --slurpfile past ./past-deploy.json 'select( IN($past[]) | not )' ./deploy.json > filtered-deploy.json
77+
jq --tab --slurpfile past ./past-deploy.json 'select( IN($past[]) | not )' ./deploy.json > filtered-deploy.json
7878
'''
7979
}
8080
stage('Archive') {

Jenkinsfile.trigger

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ node {
213213
sh '''#!/usr/bin/env bash
214214
set -Eeuo pipefail -x
215215

216-
jq <<<"$currentJobsJson" '
216+
jq <<<"$currentJobsJson" --tab '
217217
# merge the two objects recursively, preferring data from "buildCompletionDataJson"
218218
. * ( env.buildCompletionDataJson | fromjson )
219219
# save firstTime if it is not set yet

doi.jq

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ def buildkit_provenance_builder_id:
152152
# output: boolean
153153
def build_should_sbom:
154154
# see "bashbrew remote arches docker/scout-sbom-indexer:1" (we need the SBOM scanner to be runnable on the host architecture)
155-
# bashbrew remote arches --json docker/scout-sbom-indexer:1 | jq '.arches | keys_unsorted' -c
155+
# bashbrew remote arches --json docker/scout-sbom-indexer:1 | jq '.arches | keys_unsorted' --compact-output
156156
(
157157
.build.arch as $arch | ["amd64","arm32v5","arm32v7","arm64v8","i386","ppc64le","riscv64","s390x"] | index($arch)
158158
) and (

0 commit comments

Comments
 (0)