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] use multimod diff #8024

Merged

Conversation

codeboten
Copy link
Contributor

@codeboten codeboten commented Jul 4, 2023

The logic from check-changes was moved to multimod diff.

Fixes #8012

@codecov
Copy link

codecov bot commented Jul 4, 2023

Codecov Report

Patch coverage has no change and project coverage change: -0.04 ⚠️

Comparison is base (add08dd) 90.74% compared to head (54b7e98) 90.70%.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #8024      +/-   ##
==========================================
- Coverage   90.74%   90.70%   -0.04%     
==========================================
  Files         300      300              
  Lines       15164    15164              
==========================================
- Hits        13760    13754       -6     
- Misses       1123     1128       +5     
- Partials      281      282       +1     

see 1 file with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@codeboten
Copy link
Contributor Author

@codeboten codeboten force-pushed the codeboten/fix-makefile-target branch from 3fd3395 to 4f681f2 Compare July 6, 2023 21:56
@codeboten codeboten changed the title [WIP] [chore] use multimod diff [chore] use multimod diff Jul 6, 2023
@codeboten codeboten marked this pull request as ready for review July 6, 2023 21:57
@codeboten codeboten requested review from a team and djaglowski July 6, 2023 21:57
Copy link
Member

@mx-psi mx-psi left a comment

Choose a reason for hiding this comment

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

LGTM, should we do a release on opentelemetry-go-build-tools first though?

@codeboten
Copy link
Contributor Author

@mx-psi sure, here's the PR open-telemetry/opentelemetry-go-build-tools#361

@codeboten codeboten force-pushed the codeboten/fix-makefile-target branch from 4f681f2 to 347d0c6 Compare July 11, 2023 19:19
@codeboten
Copy link
Contributor Author

LGTM, should we do a release on opentelemetry-go-build-tools first though?

bumped to v0.9.0

The logic from check-changes was moved to multimod diff.

Signed-off-by: Alex Boten <aboten@lightstep.com>
@codeboten codeboten force-pushed the codeboten/fix-makefile-target branch from 347d0c6 to 54b7e98 Compare July 12, 2023 20:42
@codeboten codeboten merged commit 6f8ad88 into open-telemetry:main Jul 12, 2023
29 checks passed
@codeboten codeboten deleted the codeboten/fix-makefile-target branch July 12, 2023 20:58
@github-actions github-actions bot added this to the next release milestone Jul 12, 2023
jpkrohling added a commit to jpkrohling/opentelemetry-collector that referenced this pull request Jul 26, 2023
Signed-off-by: Juraci Paixão Kröhling <juraci@kroehling.de>
dmitryax pushed a commit that referenced this pull request Jul 26, 2023
This PR reverts #8024, as it introduced a new behavior, causing the
release to be blocked.

Apparently, multimod has a return code of 1 when diffs are seen, causing
the prepare-release target to break. After this release, we can try to
get multimod to behave in the same way as this PR.

Signed-off-by: Juraci Paixão Kröhling <juraci@kroehling.de>
codeboten pushed a commit to codeboten/opentelemetry-collector that referenced this pull request Sep 25, 2023
This is revert-ing the revert of open-telemetry#8024

Signed-off-by: Alex Boten <aboten@lightstep.com>
codeboten pushed a commit that referenced this pull request Sep 25, 2023
This is revert-ing the revert of
#8024.
This also inverses the return of `check-changes` to match the original
behaviour.

Fixes #8149

---------

Signed-off-by: Alex Boten <aboten@lightstep.com>
dmitryax added a commit that referenced this pull request Dec 11, 2023
sokoide pushed a commit to sokoide/opentelemetry-collector that referenced this pull request Dec 18, 2023
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.

Unable to run make check-change
2 participants