chore: promote develop to main - Release v2.5.0#1121
Conversation
Replace the `push: branches: [main]` trigger with `workflow_run` on the CI/CD Pipeline workflow. This prevents both workflows firing simultaneously on every main push, eliminating 4 redundant Trivy scan jobs and 3 redundant Docker image builds per production deployment. Changes: - Trigger baseline seeding after CI/CD Pipeline completes on main - Only seed when CI/CD succeeds (workflow_run.conclusion == 'success') - Add concurrency group to prevent duplicate baseline runs - Preserve weekly schedule (Monday 4 AM UTC) and manual dispatch - Update header comments and summary step to reflect new trigger model Resolves duplicate scan overlap between ci-cd.yml and seed-trivy-sarif.yml.
…e to main (#1119) Switch to dual merge strategy: squash for PRs into develop, regular merge for develop to main. Eliminates back-sync workflow.
chore(release): bump version to 2.5.0
Summary of ChangesHello, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed! This pull request finalizes the release of version 2.5.0 by merging the Highlights
🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console. Changelog
Ignored Files
Using Gemini Code AssistThe full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips. Invoking Gemini You can request assistance from Gemini at any point by creating a comment using either
Customization To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a Limitations & Feedback Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here. You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension. Footnotes
|
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request facilitates the v2.5.0 release by merging develop into main. A key process change introduced is a dual merge strategy, which is now documented across multiple files. Feature branches will be squash-merged into develop, and develop will be regular-merged into main, which removes the need for a back-sync. The changes consistently update the PR template, development workflow guides, and planning documents to reflect this new process. The version has been bumped and the changelog updated for the release. The documentation changes are clear and consistent, and I have not identified any issues requiring changes.
1 participant
Promote develop to main - Release v2.5.0
Merges all changes from develop into main for the v2.5.0 release.
Runner Updates
Performance and CI/CD
Security and Reliability
Workflow and Process
Merge instructions
Use regular merge (not squash) to preserve shared history.