Skip to content

Commit 3cc569d

Browse files
committed
ci(bun): fix latest master integration
## Summary Refresh the root Bun lock after the eslint-plugin-unicorn bump. Classify Bun locks correctly in release changelogs. Narrow GitHub ownership and remove the obsolete consumer-install action. ## Why The rebased tree failed every frozen install because master advanced a dependency without the PR's new lockfile. Master's release tooling also reintroduced Yarn-only assumptions, while recursive GitHub ownership claimed workflows that already have product owners. ## Test plan Complete script suite, full repository lint, frozen Bun install, changed-line coverage, generated license check, and shell syntax checks.
1 parent 1cf5b3b commit 3cc569d

5 files changed

Lines changed: 17 additions & 27 deletions

File tree

.github/CODEOWNERS

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# TODO: Restructure the project by product and clean up this file.
22

3-
# Default recursive ownership. GitHub applies the last matching rule, so the per-product entries
4-
# further down re-assign the parts of these trees that a product team owns.
3+
# Shared repository tooling
54
/.agents/ @DataDog/lang-platform-js
65
/.claude/ @DataDog/lang-platform-js
7-
/.github/ @DataDog/lang-platform-js
6+
/.github/actions/ @DataDog/lang-platform-js
7+
/.github/ISSUE_TEMPLATE/ @DataDog/lang-platform-js
88
/.gitlab/ @DataDog/lang-platform-js
99
/.husky/ @DataDog/lang-platform-js
1010
/.vscode/ @DataDog/lang-platform-js
@@ -328,6 +328,8 @@
328328
# CI
329329
/.github/actions/upload-coverage-artifact/ @DataDog/ci-app-libraries
330330
/.github/actions/upload-junit-artifacts/ @DataDog/ci-app-libraries
331+
/.github/all-green/ @DataDog/lang-platform-js
332+
/.github/audit-allowlist.json @DataDog/lang-platform-js
331333
/.github/editorconfig-checker/ @Datadog/lang-platform-js
332334
/.github/playwright/ @DataDog/ci-app-libraries
333335
/.github/selenium/ @DataDog/ci-app-libraries

.github/workflows/platform.yml

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -60,19 +60,7 @@ jobs:
6060
- run: mkdir -p /tmp/app
6161
- run: npm i -g pnpm
6262
if: matrix.manager.name == 'pnpm'
63-
# Wrapped in nick-fields/retry to bound the worst case: on this PR
64-
# the bun matrix entry has been stalling indefinitely at `Resolving
65-
# dependencies` on the consumer install, matching the symptom in
66-
# oven-sh/bun#5831. The four other package managers finish in ~3-5s
67-
# against the same dd-trace.tgz, so a 2-minute per-attempt cap is
68-
# generous for the happy path and tight enough that a stalled bun
69-
# retries quickly instead of holding the job for 6 hours.
70-
- uses: nick-fields/retry@ad984534de44a9489a53aefd81eb77f87c70dc60 # v4.0.0
71-
with:
72-
max_attempts: 3
73-
timeout_minutes: 2
74-
retry_wait_seconds: 5
75-
command: cd /tmp/app && ${{ matrix.manager.install }} /tmp/dd-trace.tgz
63+
- run: cd /tmp/app && ${{ matrix.manager.install }} /tmp/dd-trace.tgz
7664
- run: echo "require('dd-trace').init()" >> /tmp/app/index.js
7765
- run: node /tmp/app
7866

bun.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

scripts/release/changelog.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ const INTERNAL_PATH_PATTERNS = [
2828
/^scripts\//,
2929
/(^|\/)(?:test|tests|benchmark)(?:\/|$)/,
3030
/\.(?:spec|test)\.[cm]?[jt]sx?$/,
31-
/(^|\/)(?:package-lock\.json|yarn\.lock)$/,
31+
/(^|\/)(?:bun\.lock|package-lock\.json)$/,
3232
/^(?:AGENTS\.md|CONTRIBUTING\.md|eslint\.config\.mjs|tsconfig(?:\.[^.]+)?\.json)$/,
3333
]
3434
// Dependabot tags the commit scope `deps-dev` for development dependencies and

scripts/release/changelog.spec.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -441,47 +441,47 @@ describe('release changelog', () => {
441441
{
442442
sha: 'abc001',
443443
subject: 'chore(deps): bump form-data from 4.0.5 to 4.0.6 (#8918)',
444-
files: ['package.json', 'yarn.lock'],
444+
files: ['package.json', 'bun.lock'],
445445
},
446446
{
447447
sha: 'abc002',
448448
subject: 'chore(deps): bump protobufjs from 8.4.2 to 8.6.0 in /vendor in the ' +
449449
'vendor-minor-and-patch-dependencies group across 1 directory (#8851)',
450-
files: ['vendor/package.json', 'vendor/package-lock.json'],
450+
files: ['vendor/package.json', 'vendor/bun.lock'],
451451
},
452452
{
453453
sha: 'abc003',
454454
subject: 'chore(deps): bump the runtime-minor-and-patch-dependencies group across 1 directory ' +
455455
'with 3 updates (#8920)',
456-
files: ['package.json', 'yarn.lock'],
456+
files: ['package.json', 'bun.lock'],
457457
},
458458
{
459459
sha: 'abc004',
460460
subject: 'chore(deps-dev): bump the dev-minor-and-patch-dependencies group across 1 directory ' +
461461
'with 4 updates (#8854)',
462462
contributors: [{ name: '@dependabot', login: 'dependabot' }],
463-
files: ['package.json', 'yarn.lock'],
463+
files: ['package.json', 'bun.lock'],
464464
},
465465
{
466466
sha: 'abc005',
467467
subject: 'chore(deps): bump @anthropic-ai/sdk from 0.101.0 to 0.102.0 in ' +
468468
'/packages/dd-trace/test/plugins/versions in the ai-and-llm group across 1 directory (#8852)',
469-
files: ['packages/dd-trace/test/plugins/versions/package.json', 'yarn.lock'],
469+
files: ['packages/dd-trace/test/plugins/versions/package.json'],
470470
},
471471
{
472472
sha: 'abc006',
473473
subject: 'chore(deps): bump the serverless group across 1 directory with 8 updates (#8929)',
474-
files: ['integration-tests/serverless/package.json', 'yarn.lock'],
474+
files: ['integration-tests/serverless/package.json', 'integration-tests/serverless/package-lock.json'],
475475
},
476476
{
477477
sha: 'abc007',
478478
subject: 'chore(deps): bump markdown-it from 14.1.1 to 14.2.0 in /docs (#8932)',
479-
files: ['docs/package.json', 'yarn.lock'],
479+
files: ['docs/package.json', 'docs/bun.lock'],
480480
},
481481
{
482482
sha: 'abc008',
483483
subject: 'chore(deps): refresh transitive dependencies (#8933)',
484-
files: ['yarn.lock'],
484+
files: ['bun.lock'],
485485
},
486486
])
487487

0 commit comments

Comments
 (0)