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 CI fixes from main to v2. #1780

Closed
wants to merge 1 commit into from
Closed

Merge CI fixes from main to v2. #1780

wants to merge 1 commit into from

Conversation

@shimkiv shimkiv self-assigned this Jul 29, 2024
@mitschabaude
Copy link
Member

Is this a proper merge? I don't see any commits

@shimkiv
Copy link
Member Author

shimkiv commented Jul 29, 2024

Is this a proper merge? I don't see any commits

Yea, CI is happy now. I picked up changed files instead of concrete commits this time.

@mitschabaude
Copy link
Member

Is this a proper merge? I don't see any commits

Yea, CI is happy now. I picked up changed files instead of concrete commits this time.

In general it would be better to do merges because whoever does the merge main -> v2 next time might have to deal with fake "conflicts" introduced by this PR which is making the same changes as on main but in different commits

@shimkiv
Copy link
Member Author

shimkiv commented Jul 29, 2024

In general it would be better to do merges because whoever does the merge main -> v2 next time might have to deal with fake "conflicts" introduced by this PR which is making the same changes as on main but in different commits

Ok, since this PR already has different commit then I'll need to close this one and create one with only commits from main?

@mitschabaude
Copy link
Member

mitschabaude commented Jul 29, 2024

In general it would be better to do merges because whoever does the merge main -> v2 next time might have to deal with fake "conflicts" introduced by this PR which is making the same changes as on main but in different commits

Ok, since this PR already has different commit then I'll need to close this one and create one with only commits from main?

It's fine! Just wanted to nudge you towards using git merge next time :D

runs-on: ubuntu-latest
outputs:
test_count: ${{ steps.count_tests.outputs.test_count }}
chunk_count: 8 # This is hardcoded to 8, but it can be changed to any number.
Copy link
Member

Choose a reason for hiding this comment

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

what does this number do?

Copy link
Member Author

Choose a reason for hiding this comment

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

Amount of chunks unit tests split into I believe.

@shimkiv
Copy link
Member Author

shimkiv commented Jul 29, 2024

It's fine! Just wanted to nudge you towards using git merge next time :D

Thanks, yet I'll do it this time too. v2 -> main already has a good bunch of conflicts, and I don't want to cause more pain :)

@shimkiv shimkiv closed this Jul 29, 2024
@shimkiv shimkiv deleted the fix/v2-ci branch July 29, 2024 07:02
@shimkiv
Copy link
Member Author

shimkiv commented Jul 29, 2024

#1781
(I've used git cherry-pick)

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