Merge branch 'release' into rc

getoutreach · May 23, 2023 · 3130524 · 3130524
2 parents 8e95ccc + d59eaf5
commit 3130524
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/shell/ci/testing/setup-devenv.sh b/shell/ci/testing/setup-devenv.sh
@@ -39,7 +39,7 @@ if [[ -n $CI ]]; then
     # they end up fixing it.
     if grep -q -- "-----BEGIN" "$tmpFile"; then
       # Output is armored, convert to binary
-      gpg --dearmor "$tmpFile" | sudo tee "$keyringLocation" >/dev/null
+      gpg --output - --dearmor "$tmpFile" | sudo tee "$keyringLocation" >/dev/null
       rm "$tmpFile"
     else
       echo "Warning: GCP apt-key is not armored. We can remove this workaround now."