Pre release support

grails · Dec 22, 2024 · df9666d · df9666d
1 parent e3fd8b5
commit df9666d
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 29 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -30,6 +30,7 @@ jobs:
           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 }}
+          GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
         with:
           arguments: build -Dgeb.env=chromeHeadless
       - name: Upload Distribution

diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml
@@ -33,8 +33,8 @@ jobs:
       # Otherwise:
       - name: Export Gradle Properties
         if: steps.check_release_drafter.outputs.has_release_drafter == 'false'
-        uses: micronaut-projects/github-actions/export-gradle-properties@master
-      - uses: micronaut-projects/github-actions/release-notes@master
+        uses: grails/github-actions/export-gradle-properties@main
+      - uses: grails/github-actions/release-notes@main
         if: steps.check_release_drafter.outputs.has_release_drafter == 'false'
         id: release_notes
         with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -27,7 +27,7 @@ jobs:
         id: release_version
         run: echo "value=${GITHUB_REF:11}" >> $GITHUB_OUTPUT
       - name: Run pre-release
-        uses: micronaut-projects/github-actions/pre-release@master
+        uses: grails/github-actions/pre-release@main
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
       - name: Run Assemble
@@ -40,6 +40,7 @@ jobs:
           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 }}
+          GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
       - name: Upload Distribution
         if: success()
         uses: actions/upload-artifact@v4
@@ -64,6 +65,7 @@ jobs:
           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 }}
+          GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
         with:
           arguments: | 
             -Psigning.secretKeyRingFile=${{ github.workspace }}/secring.gpg 
@@ -90,13 +92,14 @@ jobs:
           NEXUS_PUBLISH_PASSWORD: ${{ secrets.NEXUS_PUBLISH_PASSWORD }}
           NEXUS_PUBLISH_NEXUS_URL: ${{ secrets.NEXUS_PUBLISH_RELEASE_URL }}
           NEXUS_PUBLISH_STAGING_PROFILE_ID: ${{ secrets.NEXUS_PUBLISH_STAGING_PROFILE_ID }}
+          GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
         with:
           arguments: |
             findSonatypeStagingRepository
             releaseSonatypeStagingRepository
       - name: Run post-release
         if: success()
-        uses: micronaut-projects/github-actions/post-release@master
+        uses: grails/github-actions/post-release@main
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
         env:
@@ -119,14 +122,15 @@ jobs:
           java-version: '17'
       - name: Publish Documentation
         id: docs
-        if: success() || false
+        if: success()
         uses: gradle/gradle-build-action@v3
         with:
           arguments: docs
         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 }}
+          GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
       - name: Publish to Github Pages
         if: steps.docs.outcome == 'success'
         uses: grails/github-pages-deploy-action@v2

diff --git a/build.gradle b/build.gradle
@@ -20,6 +20,16 @@ apply plugin:"org.grails.grails-publish"
 repositories {
     mavenCentral()
     maven { url "https://repo.grails.org/grails/core" }
+    if (System.getenv("GITHUB_MAVEN_PASSWORD") && !grailsVersion.endsWith('-SNAPSHOT')) {
+        System.out.println("Adding Grails Core Repo")
+        maven {
+            url = 'https://maven.pkg.github.com/grails/grails-core'
+            credentials {
+                username = 'DOES_NOT_MATTER'
+                password = System.getenv("GITHUB_MAVEN_PASSWORD")
+            }
+        }
+    }
 }
 
 dependencies {
@@ -50,7 +60,7 @@ dependencies {
     testImplementation "org.grails:grails-web-testing-support"
     testImplementation "org.mockito:mockito-core"
 
-    integrationTestImplementation testFixtures("org.grails.plugins:geb:5.0.0-SNAPSHOT")
+    integrationTestImplementation testFixtures("org.grails.plugins:geb")
     api "com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:$concurrentlinkedhashmapLruVersion"
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -2,9 +2,9 @@ projectVersion=8.0.0-SNAPSHOT
 
 asciidoctorGradlePlugin=1.6.1
 concurrentlinkedhashmapLruVersion=1.4.2
-grailsVersion=7.0.0-SNAPSHOT
+grailsVersion=7.0.0-M1
+grailsDocsVersion=7.0.0-SNAPSHOT
 grailsGradlePluginVersion=7.0.0-SNAPSHOT
-gormVersion=9.0.0-SNAPSHOT
 gparsVersion=1.2.1
 groovyVersion=4.0.24
 guide=../../guide

diff --git a/gradle/docs.gradle b/gradle/docs.gradle
@@ -73,14 +73,13 @@ subprojects {
 }
 
 def cleanTask = project.tasks.findByName("clean")
-if(cleanTask == null) {
+if (cleanTask == null) {
     task clean(type: Delete) {
         delete(buildDir)
     }
-}
-else {
+} else {
     cleanTask.doLast {
-        ant.delete(dir:"build/docs")
+        ant.delete(dir: "build/docs")
     }
 }
 
@@ -92,11 +91,11 @@ tasks.withType(Groovydoc) {
     project.rootProject.subprojects
             .findAll { !it.name != 'docs' && !it.name.startsWith('examples') }
             .each { subproject ->
-                if(subproject.file('src/main/groovy').exists()) {
+                if (subproject.file('src/main/groovy').exists()) {
                     files += subproject.files("src/main/groovy")
                 }
             }
-    if(project.file('src/main/groovy').exists()) {
+    if (project.file('src/main/groovy').exists()) {
         files += project.files("src/main/groovy")
     }
     source = files
@@ -111,26 +110,26 @@ task publishGuide(type: grails.doc.gradle.PublishGuide) {
     targetDir = project.file("${buildDir}/docs")
     sourceRepo = "https://github.com/${githubSlug}/edit/${githubBranch}/src/main/docs"
     sourceDir = new File(projectDir, "src/main/docs")
-    propertiesFiles = [ new File(rootProject.projectDir, "gradle.properties") ]
+    propertiesFiles = [new File(rootProject.projectDir, "gradle.properties")]
     asciidoc = true
     resourcesDir = project.file(docResourcesDir)
     properties = [
-            'safe':'UNSAFE',
-            'version': project.version,
-            'subtitle': project.projectDesc,
-            'api': '../api',
-            'sourceDir':rootProject.projectDir.absolutePath,
-            'sourcedir':rootProject.projectDir.absolutePath,
-            'javaee': 'https://docs.oracle.com/javaee/7/api/',
-            'javase': 'https://docs.oracle.com/javase/7/docs/api/',
+            'safe'     : 'UNSAFE',
+            'version'  : project.version,
+            'subtitle' : project.projectDesc,
+            'api'      : '../api',
+            'sourceDir': rootProject.projectDir.absolutePath,
+            'sourcedir': rootProject.projectDir.absolutePath,
+            'jakartaee': "https://jakarta.ee/specifications/platform/10/apidocs/",
+            'javase'   : "https://docs.oracle.com/en/java/javase/17/docs/api/",
             'groovyapi': 'http://docs.groovy-lang.org/latest/html/gapi/',
             'grailsapi': 'http://docs.grails.org/latest/api/',
-            'gormapi': 'http://gorm.grails.org/latest/api/',
+            'gormapi'  : 'http://gorm.grails.org/latest/api/',
             'springapi': 'https://docs.spring.io/spring/docs/current/javadoc-api/'
     ]
     doLast {
-        ant.move(file:"${project.buildDir}/docs/guide/single.html",
-                tofile:"${project.buildDir}/docs/guide/index.html", overwrite:true)
+        ant.move(file: "${project.buildDir}/docs/guide/single.html",
+                tofile: "${project.buildDir}/docs/guide/index.html", overwrite: true)
         new File(project.buildDir, "docs/index.html").text = '''
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html lang="en">
@@ -144,13 +143,13 @@ task publishGuide(type: grails.doc.gradle.PublishGuide) {
     }
 }
 
-task docs(dependsOn:[groovydoc, publishGuide]) {
+task docs(dependsOn: [groovydoc, publishGuide]) {
     group = DOCUMENTATION_GROUP
 }
 
 def assembleTask = project.tasks.findByName("assemble")
-if(assembleTask == null) {
-    task assemble(dependsOn: docs, type:Zip) {
+if (assembleTask == null) {
+    task assemble(dependsOn: docs, type: Zip) {
         baseName = "${project.name}-${project.version}"
         destinationDir = new File(project.buildDir, "distributions")
         from project.files("${buildDir}/docs")