Skip to content

ci(SDKE-1128): migrate Core Web SDK to trunk-based development#1212

Open
alexs-mparticle wants to merge 1 commit intodevelopmentfrom
feat/SDKE-1047-trunk-based
Open

ci(SDKE-1128): migrate Core Web SDK to trunk-based development#1212
alexs-mparticle wants to merge 1 commit intodevelopmentfrom
feat/SDKE-1047-trunk-based

Conversation

@alexs-mparticle
Copy link
Collaborator

@alexs-mparticle alexs-mparticle commented Mar 13, 2026

Summary

  • Replace Gitflow branch model (development/master/staging-step-1/2/3) with trunk-based development using main as trunk and an auto-updated staging branch for E2E testing and releases
  • Add release-step-1.yml (automatic staging on push to main), release-step-2.yml (manual release order for CDN), release-step-3.yml (semantic-release from staging, publish to NPM/CDN)
  • Remove staging-step-1/2/3.yml, update PR workflow to compare against main, remove gitflow checks, point dependabot/security at main
  • Remove dependabot-automerge.yml, dependabot-branch-rebase.yml, and automerge-dependabot job — dependabot PRs now target main directly for manual review (GChat notification already fires for all PRs)

Post-merge actions

  • Delete branches: development, master, release-order-a/b/c, chore/dependabot
  • Update GitHub default branch and protection rules
  • Update mPServer to reference main instead of master (SDKE-1127)
  • Verify staging pipeline triggers on next push to main
  • Dry-run release from staging branch

Test plan

  • Merge PR → verify release-step-1 (staging pipeline) triggers automatically
  • Verify staging branch = main + one dist commit
  • Dispatch release-step-3 from staging with dryRun=true
  • Verify [skip ci] commits do NOT re-trigger staging pipeline
  • Open a dependabot-style PR → verify GChat notification fires, no auto-merge

Jira: SDKE-1128

@alexs-mparticle alexs-mparticle force-pushed the feat/SDKE-1047-trunk-based branch from ff173a6 to 5bfb105 Compare March 13, 2026 19:54
@alexs-mparticle alexs-mparticle changed the title ci(SDKE-1047): migrate Core Web SDK to trunk-based development ci(SDKE-1128): migrate Core Web SDK to trunk-based development Mar 13, 2026
@alexs-mparticle alexs-mparticle changed the base branch from main to development March 13, 2026 19:56
@alexs-mparticle alexs-mparticle requested a review from a team as a code owner March 13, 2026 19:56
@alexs-mparticle alexs-mparticle force-pushed the feat/SDKE-1047-trunk-based branch from 5bfb105 to 31ce4ae Compare March 13, 2026 20:30
Replace Gitflow branch model (development/master/staging-step-1/2/3)
with trunk-based development using main as trunk and an auto-updated
staging branch for E2E testing and releases.

- Add release-step-1.yml: automatic staging pipeline on push to main
- Add release-step-2.yml: manual release order push for CDN
- Add release-step-3.yml: semantic-release from staging, publish to NPM/CDN
- Remove staging-step-1/2/3.yml (replaced by new pipeline)
- Update pull-request.yml to compare bundle size against main (not master)
- Remove pr-branch-target-gitflow check from reusable-workflows.yml
- Point dependabot and security checks at main
- Point release.config.js branches at staging

NOTE: After merging, the following branches should be deleted:
- development
- master (replaced by main)
- release-order-a/b/c (managed via release-step-2 workflow)

mPServer must be updated to reference main instead of master for the
Core Web SDK GitHub repo (see linked Jira ticket).
@alexs-mparticle alexs-mparticle force-pushed the feat/SDKE-1047-trunk-based branch from 31ce4ae to 4ae6e8d Compare March 13, 2026 20:52
@sonarqubecloud
Copy link

Quality Gate Failed Quality Gate failed

Failed conditions
8 Security Hotspots

See analysis details on SonarQube Cloud

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant