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.

Sign up for GitHub

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

Undo changes to BeamModulePlugin.groovy #28356

Merged
merged 1 commit into from
Sep 7, 2023
Merged

Undo changes to BeamModulePlugin.groovy #28356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/beam_Release_NightlySnapshot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,6 @@ jobs:
</settings>" > ${HOME}/.m2/settings.xml
- name: run Publish script
run: |
./gradlew publish --max-workers=8 -Ppublishing -PskipCheckerFramework -PisNightly \
./gradlew publish --max-workers=8 -Ppublishing -PskipCheckerFramework \
--continue -Dorg.gradle.jvmargs=-Xms2g -Dorg.gradle.jvmargs=-Xmx6g \
-Dorg.gradle.vfs.watch=false -Pdocker-pull-licenses
15 changes: 4 additions & 11 deletions buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,9 +431,6 @@ class BeamModulePlugin implements Plugin<Project> {
def isRelease(Project project) {
return parseBooleanProperty(project, 'isRelease');
}
def isNightly(Project project) {
return parseBooleanProperty(project, 'isNightly');
}
/**
* Parses -Pprop as true for use as a flag, and otherwise uses Groovy's toBoolean
*/
Expand Down Expand Up @@ -492,14 +489,10 @@ class BeamModulePlugin implements Plugin<Project> {

project.ext.mavenGroupId = 'org.apache.beam'

if (isRelease(project) && isNightly(project)) {
throw new GradleException("Cannot specify both -PisRelease and -PisNightly properties")
}
if (isNightly(project)) {
Date date = new Date()
project.version += "-" + date.format('yyyyMMdd')
}
else if (!isRelease(project)) {
// Automatically use the official release version if we are performing a release
// otherwise append '-SNAPSHOT'
project.version = '2.51.0'
if (!isRelease(project)) {
project.version += '-SNAPSHOT'
}

Expand Down