This is an automated email from the ASF dual-hosted git repository. damccorm pushed a commit to branch users/damccorm/nightlySnapshot in repository https://gitbox.apache.org/repos/asf/beam.git
commit 63890b9d28dabb2963b82b309947a919125e0c93 Author: Danny McCormick <[email protected]> AuthorDate: Thu Sep 7 13:29:32 2023 -0400 Undo changes to BeamModulePlugin.groovy --- .github/workflows/beam_Release_NightlySnapshot.yml | 2 +- .../groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 15 ++++----------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/.github/workflows/beam_Release_NightlySnapshot.yml b/.github/workflows/beam_Release_NightlySnapshot.yml index 9bd1345cd0c..1b572f4aa0f 100644 --- a/.github/workflows/beam_Release_NightlySnapshot.yml +++ b/.github/workflows/beam_Release_NightlySnapshot.yml @@ -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 diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy index 0c0574b3485..f31150227c3 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -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 */ @@ -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' }
