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

Merge unreleased now only merges project-specific changes into each project. #570

Merged
merged 6 commits into from
Oct 30, 2023

Conversation

TheSpyder
Copy link
Contributor

Closes #569

Check the following

  • Keep 100% code coverage
  • Be properly formatted
  • Documentation changes are included
  • Include a change file if expected

Additional context
The fix was so easy I decided to try my hand at my first PR in go 😅

The test I deleted was negated by #557, it's no longer possible to pass an invalid project to merge (since projects can't be passed at all). But when trying to write a test for this fix it confused me and made the process take longer than it should've - so I deleted it. Hope that's ok.

@miniscruff
Copy link
Owner

Good find, just need to run the formatter and that should be all

@TheSpyder
Copy link
Contributor Author

Yeah I didn't remember to run the linter before opening the PR 🫣

@codecov
Copy link

codecov bot commented Oct 30, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Files Coverage Δ
cmd/merge.go 100.00% <100.00%> (ø)

📢 Thoughts on this report? Let us know!.

@TheSpyder
Copy link
Contributor Author

Interestingly make lint didn't fail on my test, it complains about core/utils_test.go. I had to run gofmt -s -w on each file I changed to figure out what was wrong.

@TheSpyder
Copy link
Contributor Author

hmm, it seems the test I deleted was counting for some code coverage. Should I put it back?

@miniscruff
Copy link
Owner

Interestingly make lint didn't fail on my test, it complains about core/utils_test.go. I had to run gofmt -s -w on each file I changed to figure out what was wrong.

Hmm weird, I will take a look at the scripts to see why

@miniscruff
Copy link
Owner

hmm, it seems the test I deleted was counting for some code coverage. Should I put it back?

Yea, it's testing that one of the projects is configured wrong because the changelog path doesn't exist.

@TheSpyder
Copy link
Contributor Author

Yea, it's testing that one of the projects is configured wrong because the changelog path doesn't exist

That's where the code is no longer covered, but the test is titled "invalid project" which is no longer necessary after the project config was removed. That's why I deleted it.
https://github.com/miniscruff/changie/pull/557/files#diff-fb89a4765053f1ffc1543a1d170f07c7da15bf932610ba3e67a186d1cc051c03L129

Mind if I rename it when I bring it back?

@miniscruff
Copy link
Owner

Yea, it's testing that one of the projects is configured wrong because the changelog path doesn't exist

That's where the code is no longer covered, but the test is titled "invalid project" which is no longer necessary after the project config was removed. That's why I deleted it.
https://github.com/miniscruff/changie/pull/557/files#diff-fb89a4765053f1ffc1543a1d170f07c7da15bf932610ba3e67a186d1cc051c03L129

Mind if I rename it when I bring it back?

Yea I think more specifically it's an invalid project config. So probably worth a rename.

@TheSpyder
Copy link
Contributor Author

🤨

[2023-10-30T04:33:12.656Z] ['error'] There was an error running the uploader: Error uploading to [https://codecov.io:](https://codecov.io/)
Error: There was an error fetching the storage URL during POST: 404 -
{'detail': ErrorDetail(string='Unable to locate build via Github Actions API. Please upload with the Codecov repository upload token to resolve issue.', code='not_found')}

@miniscruff
Copy link
Owner

🤨

[2023-10-30T04:33:12.656Z] ['error'] There was an error running the uploader: Error uploading to [https://codecov.io:](https://codecov.io/)
Error: There was an error fetching the storage URL during POST: 404 -
{'detail': ErrorDetail(string='Unable to locate build via Github Actions API. Please upload with the Codecov repository upload token to resolve issue.', code='not_found')}

Usually I just retry it when this happens, never figured out why though.

@miniscruff miniscruff self-requested a review October 30, 2023 04:52
@miniscruff
Copy link
Owner

I am going to quickly do a batch+merge ( kinda want to make an action for this ) to rollout the fix asap, thanks again.

@miniscruff miniscruff merged commit 464aea8 into miniscruff:main Oct 30, 2023
5 checks passed
@TheSpyder
Copy link
Contributor Author

I'm starting to see a need for batch+merge myself, also some sort of equivalent to merge -u for batch in monorepos. I might start a ticket or discussion for that soon 🤔

@miniscruff
Copy link
Owner

I was thinking some comment based GitHub actions to run some stuff. Not sure yet.

@TheSpyder TheSpyder deleted the 569-projects-unreleased branch December 8, 2023 06:59
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.

Merge unreleased applies all changes to all projects
2 participants