Updated Build

Author: puneetbehl

.github/workflows/gradle.yml

@@ -41,6 +41,7 @@ jobs:
         with:
           arguments: check -Dgeb.env=chromeHeadless
         env:
+          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
           GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
           GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
       - name: Run Build
@@ -64,6 +65,9 @@ jobs:
         uses: gradle/gradle-build-action@v2
         if: steps.build.outcome == 'success' && github.event_name == 'push' && matrix.java == '8'
         env:
+          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
+          GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
+          GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
           ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
           ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
         with:
@@ -72,6 +76,10 @@ jobs:
         id: docs
         if: steps.build.outcome == 'success' && github.event_name == 'push' && matrix.java == '8'
         uses: gradle/gradle-build-action@v2
+        env:
+          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
+          GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
+          GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
         with:
           arguments: docs:docs
       - name: Determine docs target repository

.github/workflows/release.yml

@@ -31,6 +31,10 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
       - name: Publish to Sonatype OSSRH
         env:
+          TAGGED_VERSION: ${{ steps.release_version.outputs.release_version }}
+          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
+          GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
+          GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
           SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
           SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
           SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}

docs/build.gradle

@@ -1,6 +1,8 @@
 ext {
-    githubBranch = "7.1.x"
+    githubBranch = "8.0.x"
     checkOutDir = "build/checkout"
+    explicitGormSrc = System.getProperty("gorm.src") ?: (project.hasProperty('gorm.src') ? project.getProperty("gorm.src") : null)
+    gormSrc = explicitGormSrc ? file(explicitGormSrc).absolutePath : "$checkOutDir/gorm-src"
     zipFile = "build/source.zip"
 
     coreProjects = [
@@ -69,12 +71,17 @@ asciidoctorj {
 }
 
 task fetchSource {
-    doLast {
-        ant.mkdir dir: project.buildDir
-        ant.mkdir dir: checkOutDir
+    outputs.dir layout.buildDirectory.dir('checkout')
+    inputs.properties(branch: githubBranch)
+
+    onlyIf {
+        println "GORM SRC=$explicitGormSrc"
+        return !explicitGormSrc
+    }
 
+    doLast {
         println "Downloading GORM source code."
-        def tag = System.getenv('TRAVIS_TAG')
+        def tag = System.getenv('TAGGED_VERSION')
         if (tag) {
             ant.get src: "https://github.com/grails/grails-data-mapping/archive/${tag}.zip", dest: zipFile, verbose: true
         } else {
@@ -86,10 +93,8 @@ task fetchSource {
         }
         println "GORM source code downloaded."
     }
-}
 
-fetchSource.inputs.properties(branch:githubBranch)
-fetchSource.outputs.dir checkOutDir
+}
 
 
 task copyDocs(type:Copy, dependsOn:asciidoctor) {
@@ -131,8 +136,13 @@ task docs(dependsOn:[asciidoctor, groovydoc, copyDocs, copyResources] +
                 .collect { project -> project.tasks.groovydoc }
 )
 
-//task assemble(type: Zip, dependsOn:docs) {
-//    from "${project.buildDir}/docs"
-//    baseName = "${project.name}-${project.version}"
-//    destinationDir = project.file("${project.buildDir}/distributions")
-//}
+task assembleDocsDist(type: Zip) {
+    dependsOn docs
+    from "${project.buildDir}/docs"
+    include '*'
+    include '*/**'
+    archiveFileName = "${project.name}-${project.version}.zip"
+    destinationDirectory = project.layout.buildDirectory.dir('distributions')
+}
+
+docs.finalizedBy assembleDocsDist