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

Migrate Gradle Enterprise Plugin to Develocity Plugin #31577

Merged
merged 4 commits into from
Jun 14, 2024

Conversation

clayburn
Copy link
Contributor

This PR updates usage of the com.gradle.enterprise plugin to the equivalent com.gradle.develocity plugin as a result of renaming Gradle Enterprise to Develocity. This change will result in no functional changes to the Beam project.

For convenience, the changes have been broken up into 4 commits:

  • Applying and configuring the Develocity plugin via the new develocity configuration
  • Mass renaming GRADLE_ENTERPRISE_ACCESS_KEY to DEVELOCITY_ACCESS_KEY for the new plugin in GitHub Actions workflows (sorry, there are lots 😅)
  • Applying the most recent Common Custom User Data Gradle Plugin (2.0.1)
  • Ensuring remote cache push is disabled in forks that cannot write to the remote cache

Thank you for your contribution! Follow this checklist to help us incorporate your contribution quickly and easily:

  • Mention the appropriate issue in your description (for example: addresses #123), if applicable. This will automatically add a link to the pull request in the issue. If you would like the issue to automatically close on merging the pull request, comment fixes #<ISSUE NUMBER> instead.
  • Update CHANGES.md with noteworthy changes.
  • If this contribution is large, please file an Apache Individual Contributor License Agreement.

See the Contributor Guide for more tips on how to make review process smoother.

To check the build health, please visit https://github.com/apache/beam/blob/master/.test-infra/BUILD_STATUS.md

GitHub Actions Tests Status (on master branch)

Build python source distribution and wheels
Python tests
Java tests
Go tests

See CI.md for more information about GitHub Actions CI or the workflows README to see a list of phrases to trigger workflows.

@github-actions github-actions bot added the build label Jun 12, 2024
Copy link
Contributor

Checks are failing. Will not request review until checks are succeeding. If you'd like to override that behavior, comment assign set of reviewers

Copy link
Contributor

@damccorm damccorm left a comment

Choose a reason for hiding this comment

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

Thanks! This LGTM, would you just mind resolving conflicts? We should also verify that the whitespace failure is just a flake (it looks like it to me though)

@clayburn clayburn force-pushed the develocity-migration branch from aec7355 to 1f55b83 Compare June 14, 2024 13:24
@clayburn
Copy link
Contributor Author

Merge confict is fixed 👍

I suspect the whitespace check is a flake here too. I ran it locally from the new commit and it passed successfully: https://ge.solutions-team.gradle.com/s/72mmccuyaynyg/console-log?page=2#L1534. But I'm also not familiar with what all it is checking for.

Copy link
Contributor

@damccorm damccorm left a comment

Choose a reason for hiding this comment

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

Thanks!

@damccorm damccorm merged commit 47736c3 into apache:master Jun 14, 2024
17 checks passed
@clayburn clayburn deleted the develocity-migration branch June 14, 2024 14:26
@tommyang
Copy link

I think this PR is causing the below build error on settings.gradle.kts

Script compilation errors:

  Line 39:   server = "[https://ge.apache.org](https://www.google.com/url?q=https://ge.apache.org&sa=D)"
             ^ Val cannot be reassigned

  Line 39:   server = "[https://ge.apache.org](https://www.google.com/url?q=https://ge.apache.org&sa=D)"
                      ^ Type mismatch: inferred type is String but Property<String!>! was expected

  Line 42:     uploadInBackground = !isCi
               ^ Val cannot be reassigned

  Line 42:     uploadInBackground = !isCi
                                    ^ Type mismatch: inferred type is Boolean but Property<Boolean!>! was expected

4 errors

My best guess is that Kotlin version need to use .set() instead of assignment.

@clayburn
Copy link
Contributor Author

@tommyang - what version of Gradle are you building with? The = operator has been supported by default since Gradle 8.2. With Beam being on 8.4, I'm surprised you are seeing any issue.

@tommyang
Copy link

@clayburn Thanks for the explanation. It was indeed because the Gradle version of our particular repo was out of date. Long story short, that repo has its another Gradle project with an old wrapper and the build script invoked that for Beam src code as well. Sorry for the noise.

@clayburn
Copy link
Contributor Author

No problem, glad to help!

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.

3 participants