From 2379087c74758b39c99697b6080320219b913084 Mon Sep 17 00:00:00 2001 From: Cam Hutchison Date: Tue, 23 Apr 2024 08:04:46 +1000 Subject: [PATCH] [v15] build: Fix darwin product signing for legacy environments (#40742) Fix the `DEVELOPER_ID_INSTALLER` environment variable for the old `promote` and `build` environments for signing darwin packages. It was accidentally set to the APPLICATION ID which made `productsign` break when signing mac packages. The new `build-prod` and `build-stage` environments are unaffected. Exhibit-a: https://github.com/gravitational/teleport.e/actions/runs/8759563303/job/24044196635#step:11:42 --- darwin-signing.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/darwin-signing.mk b/darwin-signing.mk index 2572e605b1b9e..362ef16bd23fe 100644 --- a/darwin-signing.mk +++ b/darwin-signing.mk @@ -60,7 +60,7 @@ TSH_SKELETON_build_prod = tsh TEAMID_promote = $(TEAMID_build_prod) DEVELOPER_KEY_NAME_promote = $(DEVELOPER_KEY_NAME_build_prod) -INSTALLER_KEY_NAME_promote = $(DEVELOPER_KEY_NAME_build_prod) +INSTALLER_KEY_NAME_promote = $(INSTALLER_KEY_NAME_build_prod) TELEPORT_BUNDLEID_promote = $(TELEPORT_BUNDLEID_build_prod) TSH_BUNDLEID_promote = $(TSH_BUNDLEID_build_prod) TSH_SKELETON_promote = $(TSH_SKELETON_build_prod) @@ -75,7 +75,7 @@ TSH_SKELETON_build_stage = tshdev TEAMID_build = $(TEAMID_build_stage) DEVELOPER_KEY_NAME_build = $(DEVELOPER_KEY_NAME_build_stage) -INSTALLER_KEY_NAME_build = $(DEVELOPER_KEY_NAME_build_stage) +INSTALLER_KEY_NAME_build = $(INSTALLER_KEY_NAME_build_stage) TELEPORT_BUNDLEID_build = $(TELEPORT_BUNDLEID_build_stage) TSH_BUNDLEID_build = $(TSH_BUNDLEID_build_stage) TSH_SKELETON_build = $(TSH_SKELETON_build_stage)