Skip to content

Commit

Permalink
[v10] Pick correct cert when signing Connect (#15344) (#15411)
Browse files Browse the repository at this point in the history
  • Loading branch information
ravicious authored Aug 11, 2022
1 parent 9ffe9cf commit b5266f1
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
4 changes: 3 additions & 1 deletion .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -570,6 +570,7 @@ steps:
- export PKG_CONFIG_PATH="$(build.assets/build-fido2-macos.sh pkg_config_path)"
- rustup override set $RUST_VERSION
- export BUILD_NUMBER=$DRONE_BUILD_NUMBER
- export CSC_NAME=0FFD3E3413AB4C599C53FBB1D8CA690915E33D83
- security unlock-keychain -p $${BUILDBOX_PASSWORD} login.keychain
- security find-identity -v
- make clean release OS=$OS ARCH=$ARCH FIDO2=yes TOUCHID=yes
Expand Down Expand Up @@ -3286,6 +3287,7 @@ steps:
- export PKG_CONFIG_PATH="$(build.assets/build-fido2-macos.sh pkg_config_path)"
- rustup override set $RUST_VERSION
- export BUILD_NUMBER=$DRONE_BUILD_NUMBER
- export CSC_NAME=0FFD3E3413AB4C599C53FBB1D8CA690915E33D83
- security unlock-keychain -p $${BUILDBOX_PASSWORD} login.keychain
- security find-identity -v
- make clean release OS=$OS ARCH=$ARCH FIDO2=yes TOUCHID=yes
Expand Down Expand Up @@ -6044,6 +6046,6 @@ volumes:
name: drone-s3-debrepo-pvc
---
kind: signature
hmac: f0301ddeaf719deb638ce6d642e66123c111a501820b8a1f2bb1e6360314f3dd
hmac: 42f1680681b64982227795d38c826603179c24645d7214f52903515add8ef583

...
4 changes: 4 additions & 0 deletions dronegen/mac.go
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,10 @@ func darwinTagBuildCommands(b buildType, opts darwinBuildOptions) []string {
// This makes the full app version look like this: 9.3.5.12489
// https://www.electron.build/configuration/configuration.html#Configuration-buildVersion
`export BUILD_NUMBER=$DRONE_BUILD_NUMBER`,
// CSC_NAME tells electron-builder which cert to use for signing when there are multiple certs
// available.
// https://www.electron.build/code-signing
`export CSC_NAME=0FFD3E3413AB4C599C53FBB1D8CA690915E33D83`,
}

if opts.unlockKeychain {
Expand Down

0 comments on commit b5266f1

Please sign in to comment.