Skip to content

Commit

Permalink
Remove DEBUG env var from Connect macOS dronegen (#18899) (#18921)
Browse files Browse the repository at this point in the history
It was added in effort to debug flaky Connect builds (#15836).

However, we discovered that the v11.1.0 macOS version of Connect stopped
working. This was likely due to upgrade of electron-builder which recently
updated its process of building native deps
(electron-userland/electron-builder#7196).

In the Node.js ecosystem, the DEBUG env var is typically used to control
which packages emit debug messages [1]. However, after the update of
electron-builder, the env var also changed the behavior of one of the
packages responsible for building the apps.

This was confirmed by inspecting file tree between different app bundles
and running the build locally with DEBUG set to electron-*.

[1] https://www.npmjs.com/package/debug
  • Loading branch information
ravicious committed Nov 30, 2022
1 parent 4fe862c commit 322194f
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
4 changes: 1 addition & 3 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,6 @@ steps:
- security unlock-keychain -p $${BUILDBOX_PASSWORD} login.keychain
- security find-identity -v
- export CSC_NAME=0FFD3E3413AB4C599C53FBB1D8CA690915E33D83
- export DEBUG="electron-*"
- export CONNECT_TSH_BIN_PATH=$WORKSPACE_DIR/go/src/github.com/gravitational/teleport/build/tsh
- cd $WORKSPACE_DIR/go/src/github.com/gravitational/webapps
- yarn install && yarn build-term && yarn package-term -c.extraMetadata.version=$VERSION
Expand Down Expand Up @@ -8043,7 +8042,6 @@ steps:
- security unlock-keychain -p $${BUILDBOX_PASSWORD} login.keychain
- security find-identity -v
- export CSC_NAME=0FFD3E3413AB4C599C53FBB1D8CA690915E33D83
- export DEBUG="electron-*"
- cd $WORKSPACE_DIR/go/src/github.com/gravitational
- pkgutil --expand-full tsh-$${VERSION}.pkg tsh
- export CONNECT_TSH_APP_PATH=$WORKSPACE_DIR/go/src/github.com/gravitational/tsh/Payload/tsh.app
Expand Down Expand Up @@ -18269,6 +18267,6 @@ volumes:
temp: {}
---
kind: signature
hmac: 41be3692e984bd7b47556d7ddec58837eb430260bb7e6dec354d1e2df3d3e0d7
hmac: 20d24342669e0a60b5d70d1bd1d28caedfb52e3580ad2b3998e2797a49d49217

...
2 changes: 0 additions & 2 deletions dronegen/mac.go
Original file line number Diff line number Diff line change
Expand Up @@ -557,8 +557,6 @@ func darwinBuildCommands(toolchainConfig toolchainConfig, artifactConfig darwinA
// available.
// https://www.electron.build/code-signing
`export CSC_NAME=0FFD3E3413AB4C599C53FBB1D8CA690915E33D83`,

`export DEBUG="electron-*"`,
)

if artifactConfig == binariesWithConnect {
Expand Down

0 comments on commit 322194f

Please sign in to comment.