Skip to content

Fix a few more cases of --tab that I missed #143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yosifkit merged 3 commits into from
Feb 9, 2026
+4 −4
Merged

Fix a few more cases of --tab that I missed #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ee53f0a
Add `--tab` to invocations in `Jenkinsfile.deploy`
tianon Feb 9, 2026
f0a3bb5
Add `--tab` to another invocation in `Jenkinsfile.trigger`
tianon Feb 9, 2026
49fd186
Expand `-c` in `doi.jq` comment
tianon Feb 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Jenkinsfile.deploy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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[]
Expand All @@ -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') {
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile.trigger
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion doi.jq
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down