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

daml-lf: clean achive bazel build #3175

Merged
merged 4 commits into from
Oct 15, 2019
Merged

daml-lf: clean achive bazel build #3175

merged 4 commits into from
Oct 15, 2019

Conversation

remyhaemmerle-da
Copy link
Collaborator

clean achive bazel build

Pull Request Checklist

  • Read and understand the contribution guidelines
  • Include appropriate tests
  • Set a descriptive title and thorough description
  • Add a reference to the issue this PR will solve, if appropriate
  • Add a line to the release notes, if appropriate
  • Normal production system change, include purpose of change in description

NOTE: CI is not automatically run on non-members pull-requests for security
reasons. The reviewer will have to comment with /AzurePipelines run to
trigger the build.

Copy link
Contributor

@cocreature cocreature left a comment

Choose a reason for hiding this comment

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

The bazel changes look good but I am a bit worried about changing the maven coordinates. is that really what you intended?

tags = ["maven_coordinates=com.digitalasset:daml-lf-archive:__VERSION__"],
name = "daml_lf_archive_java_proto",
srcs = ["daml_lf_archive_java_proto_srcs"],
tags = ["maven_coordinates=com.digitalasset:daml-lf-%s-archive-java-proto:__VERSION__"],
Copy link
Contributor

Choose a reason for hiding this comment

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

What is the purpose of the %s here? Regardless of the details changing the maven coordinates will mean that we upload it to a different location so this should at the very least be documented in the release notes as users need to update this as well.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

My mistake. fixed

@@ -100,10 +130,10 @@ da_scala_library(
name = "daml_lf_archive_reader",
srcs = glob(["src/main/scala/**/*.scala"]),
scalacopts = lf_scalacopts,
tags = ["maven_coordinates=com.digitalasset:daml-lf-archive-reader:__VERSION__"],
tags = ["maven_coordinates=com.digitalasset:daml-lf-archive-scala:__VERSION__"],
Copy link
Contributor

Choose a reason for hiding this comment

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

As for the other change, this is potentially breaking since users will have to update their references.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

done

- target: //daml-lf/archive:daml_lf_archive_protos_zip
- target: //daml-lf/archive:daml_lf_archive_java_proto
type: jar-lib
javadoc-jar: daml_lf_archive_java_proto_javadoc.jar
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we no longer need the src-jar attribute here?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I changed how the package is generated.
Like that the haskell releaser seems to find the sources without hint.

  remy@remy-ThinkPad:~/work/daml$ ./ci/release.sh 
  ...
  Make dry run of release
  step: release artifacts got stored in /tmp/tmp.t7KbRa77vq
  remy@remy-ThinkPad:~/work/daml$ ls /tmp/tmp.t7KbRa77vq/com/digitalasset/daml-lf-archive-java-proto/100.13.29/
  daml-lf-archive-java-proto-100.13.29.jar  
  daml-lf-archive-java-proto-100.13.29-javadoc.jar 
  daml-lf-archive-java-proto-100.13.29.pom
  daml-lf-archive-java-proto-100.13.29-sources.jar
  remy@remy-ThinkPad:~/work/daml$ 

@remyhaemmerle-da
Copy link
Collaborator Author

The bazel changes look good but I am a bit worried about changing the maven coordinates. is that really what you intended?

You are right about the maven coordinate. Thanks for the careful review !

tags = ["maven_coordinates=com.digitalasset:daml-lf-archive:__VERSION__"],
name = "daml_lf_archive_java_proto",
srcs = ["daml_lf_archive_java_proto_srcs"],
tags = ["maven_coordinates=com.digitalasset:daml-lf-archive-java-proto:__VERSION__"],
Copy link
Contributor

Choose a reason for hiding this comment

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

This still has different maven coordinates than before.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I added to the release notes.

Copy link
Contributor

@cocreature cocreature left a comment

Choose a reason for hiding this comment

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

Looks good to me, thanks a lot!

@mergify mergify bot merged commit d64df4b into master Oct 15, 2019
@mergify mergify bot deleted the daml-lf-archive branch October 15, 2019 08:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants