-
Notifications
You must be signed in to change notification settings - Fork 12
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
Kbauer/use dockerized ocb #161
Conversation
ae68516
to
038b92d
Compare
@@ -21,166 +21,6 @@ t/. | |||
|
|||
|
|||
|
|||
## [github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter](https://github.com/open-telemetry/opentelemetry-collector-contrib) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
TODO: figure out where discrepancy between local machine and CI comes from (build is failing)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
- diff is due to ci generating an empty license file, so the new build process is not yet compatible with ci
- still unclear why my local machine generates a different license file than mailo-nr on their machine for a very similar change
e9d8a2b
to
c4eeb95
Compare
72a5bbd
to
3b650b9
Compare
7081b81
to
8598a7f
Compare
Closing this to reopen a new PR as I can't wrap my head around the license file discrepancies and want to rule out build machine reuse. |
Summary
otelcol_version
in manifest. This also gets rid of version inbuild.mk
potentially diverging from version in manifest0.112.0
>= 0.113.0
removes support forotelcol_version
in manifest, so I decided to leave that version bump for a separate PR to not complicate things even more.loggingexporter
getting replaced bydebugexporter
, see also this draft PR we already had pendingMakefile refactoring
As part of debugging the license file generatio, I ended up refactoring and hopefully simplifying the Makefile structure as the old structure was copied from the otel repo and is more complicated than we need it to be.
check.mk
toMakefile
as they were using the variableALL_DISTRIBUTIONS
which was defined there and are now also used in the build targets, so it makes sense to have defined in the 'root' Makefile._build/go.mod
acting as representative) or binary are already created. They were also moved frombuild.mk
toMakefile.common
where the already distro-specific 'check' targets where defined.build.mk
andcheck.mk
ar included inMakefile
and include top-level targets to build/check all distros.Misc