Skip to content

Provisioning: commit only once staged changes #108590

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 7 commits into from
Jul 24, 2025
Merged

Provisioning: commit only once staged changes #108590

merged 7 commits into from
Jul 24, 2025

Conversation

MissingRoberto
Copy link
Contributor

@MissingRoberto MissingRoberto commented Jul 24, 2025 •
edited
Loading

What is this feature?

Add the ability to commit and push only once.

Why do we need this feature?

We want to reduce the number of commits for clarity and reliability on export and migrations.

Who is this feature for?

Users of Git Sync / Provisioning.

Which issue(s) does this PR fix?:

Fixes https://github.com/grafana/git-ui-sync-project/issues/376

How:

  • Introduce staged modes to implement different commit and push strategies.
  • Add message to the expect of migration and export jobs for future frontend implementation.
  • Default to Export from Grafana message in single commit and push mode.

Special notes for your reviewer:

Please check that:

  • It works as expected from a user's perspective.
  • If this is a pre-GA feature, it is behind a feature toggle.
  • The docs are updated, and if this is a notable improvement, it's added to our What's New doc.

Testing notes:

  • Create a bunch of dashboards.
  • Connect to the repository.
  • After the migration finishes, check the history in the git repository and see it's only 1 commit for all of them:
image

@MissingRoberto MissingRoberto added no-backport Skip backport of PR no-changelog Skip including change in changelog/release notes labels Jul 24, 2025
@MissingRoberto MissingRoberto self-assigned this Jul 24, 2025
@MissingRoberto MissingRoberto marked this pull request as ready for review July 24, 2025 13:20
@MissingRoberto MissingRoberto requested review from a team as code owners July 24, 2025 13:20
@MissingRoberto MissingRoberto requested review from konsalex, joshhunt and ashharrison90 and removed request for a team July 24, 2025 13:20
@github-actions github-actions bot added this to the 12.1.x milestone Jul 24, 2025
@stephaniehingtgen stephaniehingtgen merged commit 915f47b into main Jul 24, 2025
120 of 123 checks passed
@stephaniehingtgen stephaniehingtgen deleted the feature/staged-option-to-commit-only-once branch July 24, 2025 15:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stephaniehingtgen stephaniehingtgen stephaniehingtgen approved these changes

@konsalex konsalex Awaiting requested review from konsalex konsalex is a code owner automatically assigned from grafana/grafana-app-platform-squad

@joshhunt joshhunt Awaiting requested review from joshhunt joshhunt is a code owner automatically assigned from grafana/grafana-frontend-platform

@ashharrison90 ashharrison90 Awaiting requested review from ashharrison90 ashharrison90 is a code owner automatically assigned from grafana/grafana-frontend-platform

Assignees

@MissingRoberto MissingRoberto

Labels
area/backend area/frontend no-backport Skip backport of PR no-changelog Skip including change in changelog/release notes
Projects
None yet
Milestone
12.1.x
Development

Successfully merging this pull request may close these issues.
2 participants
@MissingRoberto @stephaniehingtgen