Skip to content

Commit 1458fc3

Browse files
committed
fix: the Buildkite signing process
1 parent ff1a078 commit 1458fc3

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

nix/internal/any-darwin.nix

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -392,9 +392,9 @@ in rec {
392392
makeSignedInstaller = genClusters (cluster: pkgs.writeShellScriptBin "make-signed-installer" (let
393393

394394
# FIXME: in the future this has to be done better, now let’s reuse the Buildkite legacy:
395-
credentials = "/var/lib/buildkite-agent/signing.sh";
396-
codeSigningConfig = "/var/lib/buildkite-agent/code-signing-config.json";
397-
signingConfig = "/var/lib/buildkite-agent/signing-config.json";
395+
credentials = "/var/lib/buildkite-agent-default/signing.sh";
396+
codeSigningConfig = "/var/lib/buildkite-agent-default/code-signing-config.json";
397+
signingConfig = "/var/lib/buildkite-agent-default/signing-config.json";
398398
shallSignPredicate = "[ -f ${credentials} ] && [ -f ${codeSigningConfig} ] && [ -f ${signingConfig} ]";
399399
bashSetup = ''
400400
set -o errexit
@@ -451,7 +451,7 @@ in rec {
451451
if ${shallSignPredicate} ; then
452452
echo "Signing installer…"
453453
454-
# FIXME: this doesn’t work outside of `buildkite-agent`, it seems:
454+
# FIXME: this doesn’t work outside of `buildkite-agent-default`, it seems:
455455
#(
456456
# source ${credentials}
457457
# security unlock-keychain -p "$SIGNING" "$signingKeyChain"
@@ -473,7 +473,7 @@ in rec {
473473
cd /
474474
${bashSetup}
475475
if ${shallSignPredicate} && [ "$USER" == "root" ]; then
476-
exec sudo -u buildkite-agent ${packAndSign}
476+
exec sudo -u buildkite-agent-default ${packAndSign}
477477
else
478478
exec ${packAndSign}
479479
fi

0 commit comments

Comments
 (0)