From e0924047a15bc339c871a57294c55fb72b353f5e Mon Sep 17 00:00:00 2001 From: Sam Gammon Date: Tue, 5 Dec 2023 23:29:54 +0000 Subject: [PATCH] fix: generic generator on macos runners (#3016) Fixes an issue with the `base64` call to generate subject data on macOS-based runners. Fixes and closes slsa-framework/slsa-github-generator#3015. --------- Signed-off-by: Sam Gammon --- .../generic/create-base64-subjects-from-file/action.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/actions/generator/generic/create-base64-subjects-from-file/action.yml b/actions/generator/generic/create-base64-subjects-from-file/action.yml index 5e953c73cb..eed900be4d 100644 --- a/actions/generator/generic/create-base64-subjects-from-file/action.yml +++ b/actions/generator/generic/create-base64-subjects-from-file/action.yml @@ -65,7 +65,12 @@ runs: set -euo pipefail object="{\"artifact_name\": \"${UNTRUSTED_ARTIFACT_NAME}\", \"sha256\": \"${SHA256}\", \"filename\": \"${UNTRUSTED_FILENAME}\"}" - echo "$object" | jq - base64_object=$(echo "$object" | base64 -w0) + if test "$RUNNER_OS" = "macOS" + then + base64_object=$(echo "$object" | base64) + else + base64_object=$(echo "$object" | base64 -w0) + fi + echo "$object" | jq echo "base64=${base64_object}" >> "$GITHUB_OUTPUT"