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

[Issue #2329] API-CI/CD Automation Conflict #2520

Merged
merged 28 commits into from
Oct 18, 2024

Conversation

babebe
Copy link
Collaborator

@babebe babebe commented Oct 18, 2024

Summary

Fixes #{2329}

Time to review: 5 mins

Changes proposed

Merge workflows into one file.

Context for reviewers

Updates to PR while running the jobs(ex. ERD diagram generated) would cancel the other job. Due to jobs being similar opted for running it under one action.

Additional information

Screenshots, GIF demos, code examples or output to help show the changes working as expected.

@chouinar
Copy link
Collaborator

@babebe - if you make a change to both the API folder and DB models in the same commit, does this work in parallel with your change? (And good find to look at the concurrency, I hadn't even thought of that when writing up the ticket)

@babebe babebe force-pushed the 2329-API-CI/CD-automation-conflict branch from 7941ab5 to 373ce85 Compare October 18, 2024 15:39
@acouch
Copy link
Collaborator

acouch commented Oct 18, 2024

Please make sure to follow the PR naming conventions before you wrap up: https://github.com/HHS/simpler-grants-gov/blob/main/DEVELOPMENT.md#title , thanks.

@babebe
Copy link
Collaborator Author

babebe commented Oct 18, 2024

Please make sure to follow the PR naming conventions before you wrap up: https://github.com/HHS/simpler-grants-gov/blob/main/DEVELOPMENT.md#title , thanks.

Yes i will definitely do that

@babebe babebe changed the title update group yml [2329] API-CI/CD Automation Conflict Oct 18, 2024
@babebe babebe changed the title [2329] API-CI/CD Automation Conflict [issue # 2329] API-CI/CD Automation Conflict Oct 18, 2024
@babebe babebe changed the title [issue # 2329] API-CI/CD Automation Conflict [Issue #2329] API-CI/CD Automation Conflict Oct 18, 2024
@github-actions github-actions bot added the documentation Improvements or additions to documentation label Oct 18, 2024
@babebe
Copy link
Collaborator Author

babebe commented Oct 18, 2024

@babebe - if you make a change to both the API folder and DB models in the same commit, does this work in parallel with your change? (And good find to look at the concurrency, I hadn't even thought of that when writing up the ticket)

@chouinar I just run a test with both changes and it run both.

@babebe babebe removed the draft Not yet ready for review label Oct 18, 2024
@babebe babebe requested a review from coilysiren October 18, 2024 20:26
Copy link
Collaborator

@coilysiren coilysiren left a comment

Choose a reason for hiding this comment

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

probably wait for @chouinar though

@babebe babebe merged commit a0bc389 into main Oct 18, 2024
8 checks passed
@babebe babebe deleted the 2329-API-CI/CD-automation-conflict branch October 18, 2024 20:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update API CI/CD automation which adds ERD diagrams and OpenAPI docs to not conflict with one another
5 participants