Skip to content

V2 branch 2#4232

Merged
markphelps merged 7 commits into
v2-branch-1from
v2-branch-2
May 21, 2025
Merged

V2 branch 2#4232
markphelps merged 7 commits into
v2-branch-1from
v2-branch-2

Conversation

@markphelps

@markphelps markphelps commented May 20, 2025

Copy link
Copy Markdown
Collaborator

This builds on #4227 and adds the ability to switch branches in the UI.

It's easiest shown in this gif:

2025-05-20 16 00 41

Theres still some work to be done and bugs to fix but this shows how seamless it is switching to branched envs

Next i'll need to add the ability to create a new branch from the UI

Create and Switch to new Branched Env

CleanShot 2025-05-21 at 12 51 09@2x
CleanShot 2025-05-21 at 12 50 56@2x

@codecov

codecov Bot commented May 20, 2025

Copy link
Copy Markdown

Codecov Report

Attention: Patch coverage is 33.33333% with 20 lines in your changes missing coverage. Please review.

Project coverage is 50.97%. Comparing base (0f5f604) to head (647bd91).
Report is 1 commits behind head on v2-branch-1.

Files with missing lines Patch % Lines
internal/server/environments/environments_mock.go 0.00% 13 Missing ⚠️
internal/storage/environments/git/store.go 71.42% 3 Missing and 1 partial ⚠️
internal/server/environments/storage.go 0.00% 2 Missing ⚠️
internal/server/environments/server.go 0.00% 1 Missing ⚠️
Additional details and impacted files
@@               Coverage Diff               @@
##           v2-branch-1    #4232      +/-   ##
===============================================
- Coverage        51.00%   50.97%   -0.04%     
===============================================
  Files              122      121       -1     
  Lines            12759    12759              
===============================================
- Hits              6508     6504       -4     
- Misses            5725     5728       +3     
- Partials           526      527       +1     
Flag Coverage Δ
unittests 50.97% <33.33%> (-0.04%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@github-actions

github-actions Bot commented May 21, 2025

Copy link
Copy Markdown
Contributor

The latest Buf updates on your PR. Results from workflow Proto / proto-lint (pull_request).

BuildFormatLintBreakingUpdated (UTC)
✅ passed✅ passed✅ passed✅ passedMay 21, 2025, 6:50 PM

Signed-off-by: Mark Phelps <[email protected]>
Comment thread .gitignore
release-notes.md
config/*.*.bk No newline at end of file
config/*.*.bk
config/dev.yml No newline at end of file

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i got tired of remembering to not commit my changed config/local.yml so i decided to create config/dev.yml and add it to .gitignore

the mage:dev task will now look for this file first and fallback to config/local.yml if not found

@markphelps
markphelps marked this pull request as ready for review May 21, 2025 16:59
@markphelps
markphelps requested a review from a team as a code owner May 21, 2025 16:59
@dosubot dosubot Bot added the size:XL This PR changes 500-999 lines, ignoring generated files. label May 21, 2025
Signed-off-by: Mark Phelps <[email protected]>
Signed-off-by: Mark Phelps <[email protected]>
@markphelps
markphelps merged commit 4fe0d6d into v2-branch-1 May 21, 2025
@markphelps
markphelps deleted the v2-branch-2 branch May 21, 2025 19:13
markphelps added a commit that referenced this pull request May 21, 2025
* feat(wip): support pr workflows

Signed-off-by: Mark Phelps <[email protected]>

* chore: impl branch at server; noop publisher

Signed-off-by: Mark Phelps <[email protected]>

* chore: fix abililty to create and track remote branches

Signed-off-by: Mark Phelps <[email protected]>

* chore: reset config

Signed-off-by: Mark Phelps <[email protected]>

* chore: config again

Signed-off-by: Mark Phelps <[email protected]>

* chore: set base for branched envs

Signed-off-by: Mark Phelps <[email protected]>

* chore: explicit return

Signed-off-by: Mark Phelps <[email protected]>

* chore: regen mock

Signed-off-by: Mark Phelps <[email protected]>

* chore: add list branches and add tests

Signed-off-by: Mark Phelps <[email protected]>

* chore: fix build

Signed-off-by: Mark Phelps <[email protected]>

* chore: mockery

Signed-off-by: Mark Phelps <[email protected]>

* chore: fix linter errors

Signed-off-by: Mark Phelps <[email protected]>

* chore: nolint

Signed-off-by: Mark Phelps <[email protected]>

* chore: revert config

Signed-off-by: Mark Phelps <[email protected]>

* chore: fmt proto

Signed-off-by: Mark Phelps <[email protected]>

* chore: try to upgrade dagger version to fix build

Signed-off-by: Mark Phelps <[email protected]>

* chore: fix proto bootstrap

Signed-off-by: Mark Phelps <[email protected]>

* chore: set protoc-gen-go-grpc to latest

Signed-off-by: Mark Phelps <[email protected]>

* chore: mod tidy

Signed-off-by: Mark Phelps <[email protected]>

* V2 branch 2 (#4232)

* feat: branch picker start

Signed-off-by: Mark Phelps <[email protected]>

* feat: make branch switcher work

Signed-off-by: Mark Phelps <[email protected]>

* chore: more branch work

Signed-off-by: Mark Phelps <[email protected]>

* feat: switch to newly created branch after branching

Signed-off-by: Mark Phelps <[email protected]>

* chore: styles

Signed-off-by: Mark Phelps <[email protected]>

* chore: regen mocks

Signed-off-by: Mark Phelps <[email protected]>

* chore: fix test

Signed-off-by: Mark Phelps <[email protected]>

---------

Signed-off-by: Mark Phelps <[email protected]>

---------

Signed-off-by: Mark Phelps <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:XL This PR changes 500-999 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant