Skip to content

Commit 3a76a27

Browse files
authored
Use maintained gon fork to address Apple signing deprecation (#1997)
Summary: Use maintained gon fork to address Apple signing deprecation This is a continuation of #1994. Rather than using the macos tools directly, we can continue using gon by switching to the maintained fork ([github.com/Bearer/gon](https://github.com/Bearer/gon)) Relevant Issues: Closes #1993 Type of change: /kind bugfix Test Plan: cli-release GitHub workflow [succeeds](https://github.com/pixie-io/pixie/actions/runs/10724342153/job/29740236170) when built from this branch Changelog Message: Fix macos signing for px cli releases --------- Signed-off-by: Dom Del Nano <ddelnano@gmail.com>
1 parent 0c1fdd2 commit 3a76a27

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

.github/workflows/cli_release.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,11 @@ jobs:
8888
- name: Add pwd to git safe dir
8989
run: git config --global --add safe.directory `pwd`
9090
- name: Install gon
91-
run: brew install mitchellh/gon/gon
91+
run: brew install Bearer/tap/gon
9292
- name: Sign CLI release
9393
env:
9494
REF: ${{ github.event.ref }}
95-
AC_PASSWD: ${{ secrets.APPLE_ID_PASSWORD }}
95+
AC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
9696
KEYCHAIN_PASSWORD: ${{ secrets.APPLE_KEYCHAIN_PASSWORD }}
9797
CERT_BASE64: ${{ secrets.APPLE_SIGN_CERT_B64 }}
9898
CERT_PASSWORD: ${{ secrets.APPLE_SIGN_CERT_PASSWORD }}
@@ -135,6 +135,9 @@ jobs:
135135
uses: ./.github/actions/gcloud_creds
136136
with:
137137
SERVICE_ACCOUNT_KEY: ${{ secrets.GH_RELEASE_SA_PEM_B64 }}
138+
- name: Add pwd to git safe dir
139+
run: |
140+
git config --global --add safe.directory `pwd`
138141
- name: Upload signed CLI
139142
env:
140143
REF: ${{ github.event.ref }}

ci/cli_upload_signed.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env bash
1+
#!/bin/bash -ex
22

33
# Copyright 2018- The Pixie Authors.
44
#
@@ -21,8 +21,6 @@ repo_path=$(bazel info workspace)
2121
# shellcheck source=ci/artifact_utils.sh
2222
. "${repo_path}/ci/artifact_utils.sh"
2323

24-
set -ex
25-
2624
printenv
2725

2826
release_tag=${TAG_NAME##*/v}

ci/gon.hcl

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,16 @@
22
// using Gon.
33

44
source = ["./cli_darwin_amd64", "./cli_darwin_arm64", "cli_darwin_universal"]
5-
bundle_id = "ai.pixielabs.px"
5+
bundle_id = "ai.getcosmic.px"
66

7-
// TODO(zasgar): Update this to the orders@pixielabs.ai account. It has access to the certs,
8-
// but does not have access to application passwords.
97
apple_id {
10-
username = "zasgar@gmail.com"
11-
password = "@env:AC_PASSWD"
8+
username = "apple-dev@getcosmic.ai"
9+
# Password is provided via AC_PASSWORD env var
10+
provider = "769M9XJDG6"
1211
}
1312

1413
sign {
15-
application_identity = "Developer ID Application: Pixie Labs Inc. (SZCNTABEXY)"
14+
application_identity = "Developer ID Application: Cosmic Observe, Inc."
1615
}
1716

1817
zip {

0 commit comments

Comments
 (0)