Skip to content

[BLD] Do not trigger deploy on merge to release branches #4561

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.

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

Merged
merged 5 commits into from
May 17, 2025

Conversation

eculver
Copy link
Contributor

@eculver eculver commented May 16, 2025

Description of changes

This removes the release/** trigger from the trigger-deploy workflow so that deploys aren't created when hotfixes are merged to release branches. We want this to be a manual step for the time being to prevent unintentional deploys of the control plane when we are hotfixing the data plane.

  • Improvements & Bug fixes
    • Prevents hotfix merges from triggering a deploy of code that is potentially behind what is deployed.
  • New functionality
    • N/A - removes automation

Test plan

Manual testing -- we will have to manually deploy changes after merging hotfixes to release branches.

Copy link

Reviewer Checklist

Please leverage this checklist to ensure your code review is thorough before approving

Testing, Bugs, Errors, Logs, Documentation

  • Can you think of any use case in which the code does not behave as intended? Have they been tested?
  • Can you think of any inputs or external events that could break the code? Is user input validated and safe? Have they been tested?
  • If appropriate, are there adequate property based tests?
  • If appropriate, are there adequate unit tests?
  • Should any logging, debugging, tracing information be added or removed?
  • Are error messages user-friendly?
  • Have all documentation changes needed been made?
  • Have all non-obvious changes been commented?

System Compatibility

  • Are there any potential impacts on other parts of the system or backward compatibility?
  • Does this change intersect with any items on our roadmap, and if so, is there a plan for fitting them together?

Quality

  • Is this code of a unexpectedly high quality (Readability, Modularity, Intuitiveness)

Copy link
Contributor

propel-code-bot bot commented May 16, 2025

This PR modifies GitHub workflows to prevent automatic deployment when changes are merged to release branches. This makes deployment a manual step to avoid unintentional deploys when hotfixing the data plane.

This summary was automatically generated by @propel-code-bot

@@ -220,7 +220,7 @@ jobs:
// - This workflow finishes for A and deploys A to Chroma Cloud
// Chroma Cloud is now running A, but the last commit was B.
"environment": "staging",
"planes": "data,control"
"planes": "control,data"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

for consistency...

@eculver eculver enabled auto-merge (squash) May 17, 2025 03:43
@eculver eculver disabled auto-merge May 17, 2025 21:28
@eculver
Copy link
Contributor Author

eculver commented May 17, 2025

There is some issue with the action runners that is completely unrelated to this change. It seems to be persistent. I'm going to merge this as it has nothing to do with this change -- this does not change the "PR Checks" workflow. I'm hoping that it's something about this PR that is broken and that the merge commit will yield a green.

@eculver eculver merged commit 87561f7 into main May 17, 2025
56 of 70 checks passed
@eculver eculver deleted the eculver/gha-deploy-fixes branch May 17, 2025 23:08
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.

2 participants