Skip to content

ci(SDKE-1047): migrate Rokt Kit to trunk-based development#65

Draft
alexs-mparticle wants to merge 2 commits intomainfrom
feat/SDKE-1047-trunk-based
Draft

ci(SDKE-1047): migrate Rokt Kit to trunk-based development#65
alexs-mparticle wants to merge 2 commits intomainfrom
feat/SDKE-1047-trunk-based

Conversation

@alexs-mparticle
Copy link
Collaborator

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

Summary

  • Add staging pipeline that triggers on push to main — builds, tests, and force-pushes a staging branch with built dist/
  • Simplify release workflow to release from staging and push release commits back to main
  • Remove Gitflow artifacts: release/* branches, development branch syncing, branch target checks
  • Update semantic-release config to use staging branch

Test plan

  • Merge to main and verify staging pipeline runs (build, test, push staging branch)
  • Trigger release workflow dry-run from staging branch
  • Verify [skip ci] guard prevents infinite loop when release commits land on main

Jira: SDKE-1047

Replace Gitflow branch model (development/main with manual release)
with trunk-based development using main as trunk and an auto-updated
staging branch for E2E testing and releases.

- Add staging.yml: automatic staging pipeline on push to main
- Rewrite release.yml: 2-job pipeline releasing from staging branch
- Remove pr-branch-target-gitflow check from reusable-workflows.yml
- Point release.config.js branches at staging

NOTE: After merging, the following branches should be deleted:
- development (replaced by main as trunk)
- master (if still exists, replaced by main)

mPServer must be updated to reference main instead of master for the
Rokt Web Kit GitHub repo (see linked Jira ticket).
Remove unnecessary concurrency groups, redundant branch checks,
and consolidate staging pipeline into a single job to eliminate
duplicate builds.
@alexs-mparticle alexs-mparticle marked this pull request as draft March 16, 2026 21:57
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