Skip to content
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

chore: propagate hotfixes from master to develop #1200

Merged
merged 49 commits into from
Mar 8, 2024

Conversation

limwa
Copy link
Member

@limwa limwa commented Mar 8, 2024

This PR propagates recent hotfixes made to the master branch.

Review checklist

  • Terms and conditions reflect the current change
  • Contains enough appropriate tests
  • If aimed at production, writes a new summary in whatsnew/whatsnew-pt-PT
  • Properly adds an entry in changelog.md with the change
  • If PR includes UI updates/additions, its description has screenshots
  • Behavior is as expected
  • Clean, well-structured code

bdmendes and others added 30 commits March 4, 2024 19:11
This occurs when there are too many PRs merged in a 10-minute
window. To avoid this, we set a concurrency group per branch
(in this case only develop and master apply). I feel like that
cancelling the previous deploy actions makes the merged PR
less semantic because we technically loose track of where the
hotfixes happened.
hotfix: closed transaction in restaurants database
@LuisDuarte1 LuisDuarte1 changed the title chore: propagate hotfixes from develop to master chore: propagate hotfixes from master to develop Mar 8, 2024
@limwa limwa enabled auto-merge March 8, 2024 21:56
Copy link

codecov bot commented Mar 8, 2024

Codecov Report

Merging #1200 (687fdf7) into develop (c3f6217) will increase coverage by 1%.
Report is 8 commits behind head on develop.
The diff coverage is 13%.

Additional details and impacted files
@@           Coverage Diff           @@
##           develop   #1200   +/-   ##
=======================================
+ Coverage       16%     17%   +1%     
=======================================
  Files          229     229           
  Lines         6957    6975   +18     
=======================================
+ Hits          1086    1151   +65     
+ Misses        5871    5824   -47     

@limwa limwa merged commit 27b0414 into develop Mar 8, 2024
6 checks passed
@limwa limwa deleted the limwa/chore/backport-hotfixes-20240308 branch March 8, 2024 22:00
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.

4 participants