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

Update Dockerfile.windows with changes missed in #607. #640

Merged
merged 2 commits into from
Jun 1, 2022

Conversation

jkschulz
Copy link
Contributor

#607 included changes that altered build flags for gradle because of an upstream change -- unclear whether this was necessary for the purpose of the PR or not (to add a metrics receiver for Jetty). These changes were only made for the Linux build, but not Windows, breaking the Windows builds.

See https://github.com/GoogleCloudPlatform/ops-agent/pull/607/files#r880772695

Fixes http://b/234486247

#607 included changes that altered build flags for gradle because of an [upstream change](open-telemetry/opentelemetry-java-contrib#274) -- unclear whether this was necessary for the purpose of the PR or not (to add a metrics receiver for Jetty). These changes were only made for the Linux build, but not Windows, breaking the Windows builds. 

See https://github.com/GoogleCloudPlatform/ops-agent/pull/607/files#r880772695

Fixes http://b/234486247
@jkschulz jkschulz requested a review from igorpeshansky May 31, 2022 22:23
Copy link
Member

@igorpeshansky igorpeshansky left a comment

Choose a reason for hiding this comment

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

LGTM modulo Windows build success :shipit:

@jkschulz
Copy link
Contributor Author

jkschulz commented Jun 1, 2022

windows build passed! http://b/234486247#comment5

@jkschulz jkschulz merged commit 3d01324 into master Jun 1, 2022
@jkschulz jkschulz deleted the jkschulz-windows-build-fix branch June 1, 2022 01:49
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.

2 participants