Skip to content

Skip Sentry initialization in E2E tests #813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bcotrim merged 37 commits into from
Jan 22, 2025
Merged

Skip Sentry initialization in E2E tests #813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
3031fcf
Skip Sentry initialization in E2E tests
bcotrim Jan 16, 2025
12b9b51
also remove sentry init from unit tests
bcotrim Jan 16, 2025
1706287
disable steps for debugging
bcotrim Jan 16, 2025
0b22817
enable some steps for debugging
bcotrim Jan 16, 2025
916bfca
add building variable
bcotrim Jan 16, 2025
65bbe35
disable steps for debugging
bcotrim Jan 16, 2025
7173291
enable mac build
bcotrim Jan 16, 2025
6d9f7d5
remove dev version changes
bcotrim Jan 16, 2025
925c585
remove sentry init
bcotrim Jan 16, 2025
d43e1dd
remove sentry init
bcotrim Jan 16, 2025
05108dc
adjust webpack sentry plugin
bcotrim Jan 16, 2025
7de7e7b
adjust webpack sentry plugin
bcotrim Jan 16, 2025
bee1b83
revert unnecessary changes
bcotrim Jan 16, 2025
bfa5f32
revert unnecessary changes
bcotrim Jan 16, 2025
94b73d2
check if windows is failing
bcotrim Jan 16, 2025
9736e3e
check if e2e is causing issues
bcotrim Jan 16, 2025
a39fe9a
attempt to fix e2e issue
bcotrim Jan 16, 2025
3f8b3bd
attempt to fix windows build
bcotrim Jan 16, 2025
f5ac5cc
rename DEV_BUILD to IS_DEV_BUILD for consistency
bcotrim Jan 17, 2025
79eeaba
add variable to root
bcotrim Jan 20, 2025
9e33c33
add more details to debug issue source
bcotrim Jan 20, 2025
3821092
add more details to debug issue source
bcotrim Jan 20, 2025
148fc53
add more details to debug issue source
bcotrim Jan 20, 2025
85d34f6
add more details to debug issue source
bcotrim Jan 20, 2025
383b915
add more details to debug issue source
bcotrim Jan 20, 2025
83b9b64
add more details to debug issue source
bcotrim Jan 20, 2025
b29a0b5
add more details to debug issue source
bcotrim Jan 20, 2025
d6de390
add more details to debug issue source
bcotrim Jan 20, 2025
2c69da5
add more details to debug issue source
bcotrim Jan 20, 2025
1af221c
cleanup
bcotrim Jan 20, 2025
a331eb2
cleanup
bcotrim Jan 20, 2025
663601b
fix windows build
bcotrim Jan 20, 2025
ed9143a
cleanup
bcotrim Jan 20, 2025
9138adf
add IS_DEV_BUILD to env param
bcotrim Jan 21, 2025
511b1b2
update IS_DEV_BUILD for e2e step
bcotrim Jan 21, 2025
c8ce53a
update IS_DEV_BUILD for remaining steps
bcotrim Jan 21, 2025
0462f1c
remove unnecessary E2E check from Sentry init
bcotrim Jan 22, 2025
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .buildkite/commands/build-for-windows-dev.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Write-Host "--- :node: Building App"
node ./scripts/prepare-dev-build-version.mjs
If ($LastExitCode -ne 0) { Exit $LastExitCode }

$env:IS_DEV_BUILD="true"
npm run make

# Rename NuGet package files with generic name
Expand Down
8 changes: 7 additions & 1 deletion .buildkite/pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ steps:
command: |
# call with bash explicitly because we run this on Windows, too
bash .buildkite/commands/install-node-dependencies.sh
export IS_DEV_BUILD=true
echo '--- :package: Package app for testing'
npm run package
echo '--- :playwright: Run End To End Tests'
Expand Down Expand Up @@ -87,6 +88,8 @@ steps:

node ./scripts/prepare-dev-build-version.mjs

export IS_DEV_BUILD=true

echo "--- :node: Building Binary"
npm run make:macos-{{matrix}}

Expand Down Expand Up @@ -127,6 +130,7 @@ steps:
- label: 🔨 Windows Dev Build
key: dev-windows
command: |
$env:IS_DEV_BUILD="true"
.buildkite/commands/build-for-windows-dev.ps1
node scripts/package-appx.mjs
artifact_paths:
Expand All @@ -152,8 +156,10 @@ steps:

.buildkite/commands/install-node-dependencies.sh

export IS_DEV_BUILD=true

echo "--- :node: Generating Release Manifest"
IS_DEV_BUILD=true node ./scripts/generate-releases-manifest.mjs
node ./scripts/generate-releases-manifest.mjs

echo "--- :fastlane: Distributing Dev Builds"
install_gems
Expand Down
7 changes: 2 additions & 5 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,11 @@ import { stopAllServersOnQuit } from './site-server';
import { loadUserData } from './storage/user-data'; // eslint-disable-next-line import/order
import { setupUpdates } from './updates';

if ( ! isCLI() ) {
if ( ! isCLI() && ! process.env.IS_DEV_BUILD ) {

@fredrikekelund fredrikekelund Jan 22, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we still need to check process.env.E2E in the enabled key just below this?

@bcotrim bcotrim Jan 22, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can probably remove it now.
Locally it will fall into the 'development' check, and on CI we have the IS_DEV_BUILD=true check.
Good catch!
Sentry.init( {
dsn: 'https://97693275b2716fb95048c6d12f4318cf@o248881.ingest.sentry.io/4506612776501248',
debug: true,
enabled:
process.env.NODE_ENV !== 'development' &&
process.env.NODE_ENV !== 'test' &&
! process.env.E2E,
enabled: process.env.NODE_ENV !== 'development' && process.env.NODE_ENV !== 'test',
release: `${ app.getVersion() ? app.getVersion() : COMMIT_HASH }-${ getPlatformName() }`,
} );
}
Expand Down
3 changes: 2 additions & 1 deletion webpack.plugins.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ export const plugins: WebpackPluginInstance[] = [
},
} ),
// Sentry must be the last plugin
!! process.env.SENTRY_AUTH_TOKEN &&
! process.env.IS_DEV_BUILD &&
!! process.env.SENTRY_AUTH_TOKEN &&
sentryWebpackPlugin( {
authToken: process.env.SENTRY_AUTH_TOKEN,
org: 'a8c',
Expand Down