Skip to content

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

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

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

Conversation

@alexs-mparticle
Copy link
Collaborator

Summary

  • 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 as 2-job pipeline releasing from staging branch
  • Remove gitflow branch target check, point release.config.js at staging

Post-merge actions

  • Delete branches: development, master (if exists)
  • 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 staging pipeline triggers automatically
  • Verify staging branch is created (first time) with main + dist commit
  • Dispatch release from staging with dryRun=true
  • Verify [skip ci] commits do NOT re-trigger staging pipeline

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).
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