Fix our use of yq

Tool: gitpod/catfood.gitpod.cloud

Author: filiptronicek

.github/workflows/dockerhub-release.yml

@@ -91,7 +91,7 @@ jobs:
         env:
           SKOPEO_AUTH_DIR: ${{env.SKOPEO_AUTH_DIR}}
         run: |
-          IMAGES=$(cat .github/promote-images.yml | yq '."europe-docker.pkg.dev/gitpod-artifacts/docker-dev"."images-by-tag-regex"|keys[]' -r)
+          IMAGES=$(cat .github/promote-images.yml | yq '."europe-docker.pkg.dev/gitpod-artifacts/docker-dev"."images-by-tag-regex"|keys[]')
           for IMAGE in $IMAGES;
           do
             sudo -E skopeo copy --format=oci --dest-oci-accept-uncompressed-layers --retry-times=5 \

.github/workflows/push-main.yml

@@ -168,7 +168,7 @@ jobs:
         run: |
           set -euo pipefail
 
-          IFS=$'\n' read -r -d '' -a IMAGE_TAGS_ARR < <(yq -r '.sync.images."workspace-base-images"[]' ./.github/sync-containers.yml && printf '\0')
+          IFS=$'\n' read -r -d '' -a IMAGE_TAGS_ARR < <(yq '.sync.images."workspace-base-images"[]' ./.github/sync-containers.yml && printf '\0')
           UPLOADS_STRING=""
           for IMAGE_TAG in "${IMAGE_TAGS_ARR[@]}"; do
               UPLOADS_STRING+=$(printf "./.github/workflows/push-main/upload_image.sh %s%s" ${IMAGE_TAG}'\n')

build-chunk.sh

@@ -30,7 +30,7 @@ function extract_variants() {
 	if [[ ! -f "chunks/${chunk_name}/chunk.yaml" ]]; then
 		variants+=("${chunk_name}")
 	else
-		for variant in $(yq '.variants[].name' -r <"chunks/${chunk_name}/chunk.yaml"); do
+		for variant in $(yq '.variants[].name' "chunks/${chunk_name}/chunk.yaml"); do
 			variants+=("${chunk_name}:${variant}")
 		done
 	fi

build-combo.sh

@@ -9,7 +9,7 @@ function build_combination() {
 	combination=$1
 
 	local exists
-	exists="$(yq e '.combiner.combinations[] | select (.name=="'"$combination"'")' dazzle.yaml)"
+	exists="$(yq '.combiner.combinations[] | select (.name=="'"$combination"'")' dazzle.yaml)"
 	if [[ -z "$exists" ]]; then
 		echo "combination is not defined"
 		exit 1
@@ -30,7 +30,7 @@ function get_refs() {
 	local ref=$1
 	echo "$ref"
 
-	refs="$(yq e '.combiner.combinations[] | select (.name=="'"$ref"'") | .ref[]' dazzle.yaml)"
+	refs="$(yq '.combiner.combinations[] | select (.name=="'"$ref"'") | .ref[]' dazzle.yaml)"
 	if [[ -z "$refs" ]]; then
 		return
 	fi
@@ -43,7 +43,7 @@ function get_refs() {
 function get_chunks() {
 	# shellcheck disable=SC2068
 	for ref in $@; do
-		chunks=$(yq e '.combiner.combinations[] | select (.name=="'"$ref"'") | .chunks[]' dazzle.yaml)
+		chunks=$(yq '.combiner.combinations[] | select (.name=="'"$ref"'") | .chunks[]' dazzle.yaml)
 		echo "$chunks"
 	done
 }

build-common.sh

@@ -30,7 +30,7 @@ function get_available_chunks() {
 	for chunk in $chunk_defs; do
 		local chunkYaml="chunks/${chunk}/chunk.yaml"
 		if [[ -f "$chunkYaml" ]]; then
-			variants=$(yq e '.variants[].name' "$chunkYaml")
+			variants=$(yq '.variants[].name' "$chunkYaml")
 			for variant in $variants; do
 				echo "$chunk:$variant"
 			done