[skip ci] check grails core for packages to build releases

grails · Dec 20, 2024 · 4732664 · 4732664
1 parent 3214c6d
commit 4732664
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 13 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -28,7 +28,7 @@ jobs:
       - name: "🔨 Run Build"
         id: build
         env:
-          SITEMESH_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
         run: ./gradlew build --refresh-dependencies
       - name: "📤 Upload Artifact"
         if: success()
@@ -57,7 +57,7 @@ jobs:
           develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
       - name: "📤 Publish Snapshot to repo.grails.org"
         env:
-          SITEMESH_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
           ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
           ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
         run: ./gradlew publish
@@ -83,7 +83,7 @@ jobs:
       - name: "🔨 Build Docs"
         id: docs
         env:
-          SITEMESH_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
         run: ./gradlew docs --refresh-dependencies
       - name: "📤 Publish docs to Github Pages"
         if: steps.docs.outcome == 'success'

diff --git a/.github/workflows/groovy-joint-workflow.yml b/.github/workflows/groovy-joint-workflow.yml
@@ -137,7 +137,7 @@ jobs:
         run: sed -i 's|// mavenLocal() // Keep|mavenLocal() // Keep|' build.gradle
       - name: "🔨 Build and test project using the locally built Groovy snapshot"
         env:
-          SITEMESH_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
           DEVELOCITY_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
           DEVELOCITY_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
         run: >

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -34,7 +34,7 @@ jobs:
         if: success()
         run: ./gradlew assemble
         env:
-          SITEMESH_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
       - name: "📤 Upload Distribution"
         if: success()
         uses: actions/upload-artifact@v4
@@ -48,7 +48,7 @@ jobs:
       - name: "📤 Publish to and close Sonatype staging repository"
         id: publish
         env:
-          SITEMESH_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
           SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
           SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
           SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}
@@ -82,7 +82,7 @@ jobs:
           develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
       - name: "🚀 Release Sonatype Staging Repository"
         env:
-          SITEMESH_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
           SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
           SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
           SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}
@@ -115,7 +115,7 @@ jobs:
           develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
       - name: "📖 Generate documentation"
         env:
-          SITEMESH_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
         run: ./gradlew docs
       - name: "📤 Publish documentation to Github Pages"
         if: success()

diff --git a/build.gradle b/build.gradle
@@ -41,13 +41,24 @@ allprojects { prj ->
             }
         }
 
-        if (System.getenv("SITEMESH_MAVEN_PASSWORD") && prj.name == 'grails-plugin-gsp' && !sitemeshVersion.endsWith('-SNAPSHOT')) {
+        if (System.getenv("GITHUB_MAVEN_PASSWORD") && prj.name == 'grails-plugin-gsp' && !sitemeshVersion.endsWith('-SNAPSHOT')) {
             System.out.println("Adding Sitemesh Repo")
             maven {
                 url = 'https://maven.pkg.github.com/codeconsole/grails-plugin-sitemesh3'
                 credentials {
                     username = 'DOES_NOT_MATTER'
-                    password = System.getenv("SITEMESH_MAVEN_PASSWORD")
+                    password = System.getenv("GITHUB_MAVEN_PASSWORD")
+                }
+            }
+        }
+
+        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")
                 }
             }
         }

diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 title=Groovy Server Pages (GSP)
 authors=Puneet Behl
-projectVersion=7.0.0-SNAPSHOT
+projectVersion=7.0.0-M1
 projectDesc=GSP (Groovy Server Pages) - A server-side view rendering technology based on Groovy
 projectUrl=https://github.com/grails/grails-gsp
 githubSlug=grails/grails-gsp
@@ -10,12 +10,12 @@ developers=Puneet Behl, Graeme Rocher
 commonsTextVersion=1.13.0
 elApiVersion=6.0.1
 grailsGradlePluginVersion=7.0.0-SNAPSHOT
-grailsVersion=7.0.0-SNAPSHOT
+grailsVersion=7.0.0-M1
 groovyVersion=4.0.24
 jspApiVersion=4.0.0
 jstlVersion=3.0.1
 servletApiVersion=6.0.0
-sitemeshVersion=7.0.0-SNAPSHOT
+sitemeshVersion=7.0.0-M1
 controllersRef=https://docs.grails.org/latest/ref/Controllers
 commandLineRef=https://docs.grails.org/latest/ref/Command%20Line
 grailsDocsVersion=7.0.0-SNAPSHOT