Merge pull request #150 from rjaegers/main

fix: GITHUB_OUTPUT doesn't need {}
philips-software · Oct 25, 2022 · 75cafd6 · 75cafd6
2 parents d44319c + b4ce923
commit 75cafd6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/container_digest.sh b/container_digest.sh
@@ -49,14 +49,14 @@ docker pull "$registry_url_prefix"/"$imagename":"$basetag"
 echo "Getting digest for $registry_url_prefix/$imagename:$basetag"
 containerdigest=$(docker inspect "$registry_url_prefix"/"$imagename":"$basetag" --format '{{ index .RepoDigests 0 }}' | cut -d '@' -f 2)
 echo "found: ${containerdigest}"
-echo "{container-digest}={${containerdigest}}" >> "$GITHUB_OUTPUT"
+echo "container-digest=${containerdigest}" >> "$GITHUB_OUTPUT"
 
 echo "--------------------------------------------------------------------------------------------"
 
 echo "Getting tags"
 containertags=$(docker inspect "$registry_url_prefix"/"$imagename":"$basetag" --format '{{ join .RepoTags "\n" }}' | sed 's/.*://' | paste -s -d ',' -)
 echo "found: ${containertags}"
-echo "{container-tags}={${containertags}}" >> "$GITHUB_OUTPUT"
+echo "container-tags=${containertags}" >> "$GITHUB_OUTPUT"
 
 echo "============================================================================================"
 echo "Finished getting docker digest and tags"
@@ -107,7 +107,7 @@ then
   echo "-------------------------------------------------------------------------------------------"
   echo " provenance.json "
   echo "-------------------------------------------------------------------------------------------"
-  echo "{slsa-provenance-file}={provenance.json}" >> "$GITHUB_OUTPUT"
+  echo "slsa-provenance-file=provenance.json" >> "$GITHUB_OUTPUT"
 
   echo "============================================================================================"
   echo "Finished getting SLSA Provenance"
@@ -142,7 +142,7 @@ then
   echo "Remove formatting"
   jq -c . sbom-spdx-formatted.json > sbom-spdx.json
 
-  echo "{sbom-file}={sbom-spdx.json}" >> "$GITHUB_OUTPUT"
+  echo "sbom-file=sbom-spdx.json" >> "$GITHUB_OUTPUT"
 
   echo "============================================================================================"
   echo "Finished getting SBOM"

diff --git a/docker_build_and_push.sh b/docker_build_and_push.sh
@@ -13,7 +13,7 @@ if [ "$#" -lt 4 ]; then
 fi
 
 push() {
-  echo "{push-indicator}={true}" >> "$GITHUB_OUTPUT"
+  echo "push-indicator=true" >> "$GITHUB_OUTPUT"
 
   "${FOREST_DIR}"/docker_push.sh "$@"
   "${FOREST_DIR}"/container_digest.sh "$@"
@@ -53,4 +53,3 @@ done
 
 echo "No branches matched to current branch. No need to push the images to docker hub."
 exit 0
-