Skip to content

Commit 7518e3a

Browse files
authored
Merge branch 'main' into sig/add-ignore-to-inject
2 parents 19271c1 + 8b93465 commit 7518e3a

4 files changed

Lines changed: 28 additions & 6 deletions

File tree

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Changelog Preview
2+
on:
3+
pull_request:
4+
types:
5+
- opened
6+
- synchronize
7+
- reopened
8+
- edited
9+
- labeled
10+
- unlabeled
11+
permissions:
12+
contents: write
13+
pull-requests: write
14+
15+
jobs:
16+
changelog-preview:
17+
uses: getsentry/craft/.github/workflows/changelog-preview.yml@v2
18+
secrets: inherit

.github/workflows/release.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,18 @@ on:
33
workflow_dispatch:
44
inputs:
55
version:
6-
description: Version to release
7-
required: true
6+
description: Version to release (or "auto")
7+
required: false
88
force:
99
description: Force a release even when there are release-blockers (optional)
1010
required: false
1111
merge_target:
1212
description: Target branch to merge into. Uses the default branch as a fallback (optional)
1313
required: false
14+
permissions:
15+
contents: write
16+
pull-requests: write
17+
1418
jobs:
1519
release:
1620
runs-on: ubuntu-latest
@@ -27,7 +31,7 @@ jobs:
2731
token: ${{ steps.token.outputs.token }}
2832
fetch-depth: 0
2933
- name: Prepare release
30-
uses: getsentry/action-prepare-release@v1
34+
uses: getsentry/craft@c6e2f04939b6ee67030588afbb5af76b127d8203 # v2
3135
env:
3236
GITHUB_TOKEN: ${{ steps.token.outputs.token }}
3337
with:

packages/bundler-plugin-core/src/build-plugin-manager.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ export function createSentryBuildPluginManager(
561561
...serializeIgnoreOptions(options.sourcemaps?.ignore),
562562
...buildArtifactPaths,
563563
],
564-
options.debug ?? false
564+
options.debug ? "rejectOnError" : false
565565
);
566566
} catch (e) {
567567
sentryScope.captureException('Error in "debugIdInjectionPlugin" writeBundle hook');

packages/bundler-plugin-core/test/build-plugin-manager.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ describe("createSentryBuildPluginManager", () => {
439439
);
440440
});
441441

442-
it("should pass debug flag when options.debug is true", async () => {
442+
it('should pass "rejectOnError" flag when options.debug is true', async () => {
443443
mockCliExecute.mockResolvedValue(undefined);
444444

445445
const buildPluginManager = createSentryBuildPluginManager(
@@ -460,7 +460,7 @@ describe("createSentryBuildPluginManager", () => {
460460

461461
expect(mockCliExecute).toHaveBeenCalledWith(
462462
["sourcemaps", "inject", "--ignore", "node_modules", "/path/to/bundle"],
463-
true
463+
"rejectOnError"
464464
);
465465
});
466466
});

0 commit comments

Comments
 (0)