Skip to content
This repository was archived by the owner on Mar 10, 2025. It is now read-only.

Commit 4732664

Browse files
committed
[skip ci] check grails core for packages to build releases
1 parent 3214c6d commit 4732664

File tree

5 files changed

+24
-13
lines changed

5 files changed

+24
-13
lines changed

.github/workflows/gradle.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: "🔨 Run Build"
2929
id: build
3030
env:
31-
SITEMESH_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
31+
GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
3232
run: ./gradlew build --refresh-dependencies
3333
- name: "📤 Upload Artifact"
3434
if: success()
@@ -57,7 +57,7 @@ jobs:
5757
develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
5858
- name: "📤 Publish Snapshot to repo.grails.org"
5959
env:
60-
SITEMESH_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
60+
GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
6161
ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
6262
ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
6363
run: ./gradlew publish
@@ -83,7 +83,7 @@ jobs:
8383
- name: "🔨 Build Docs"
8484
id: docs
8585
env:
86-
SITEMESH_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
86+
GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
8787
run: ./gradlew docs --refresh-dependencies
8888
- name: "📤 Publish docs to Github Pages"
8989
if: steps.docs.outcome == 'success'

.github/workflows/groovy-joint-workflow.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ jobs:
137137
run: sed -i 's|// mavenLocal() // Keep|mavenLocal() // Keep|' build.gradle
138138
- name: "🔨 Build and test project using the locally built Groovy snapshot"
139139
env:
140-
SITEMESH_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
140+
GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
141141
DEVELOCITY_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
142142
DEVELOCITY_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
143143
run: >

.github/workflows/release.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
if: success()
3535
run: ./gradlew assemble
3636
env:
37-
SITEMESH_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
37+
GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
3838
- name: "📤 Upload Distribution"
3939
if: success()
4040
uses: actions/upload-artifact@v4
@@ -48,7 +48,7 @@ jobs:
4848
- name: "📤 Publish to and close Sonatype staging repository"
4949
id: publish
5050
env:
51-
SITEMESH_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
51+
GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
5252
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
5353
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
5454
SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}
@@ -82,7 +82,7 @@ jobs:
8282
develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
8383
- name: "🚀 Release Sonatype Staging Repository"
8484
env:
85-
SITEMESH_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
85+
GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
8686
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
8787
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
8888
SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}
@@ -115,7 +115,7 @@ jobs:
115115
develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
116116
- name: "📖 Generate documentation"
117117
env:
118-
SITEMESH_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
118+
GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
119119
run: ./gradlew docs
120120
- name: "📤 Publish documentation to Github Pages"
121121
if: success()

build.gradle

+13-2
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,24 @@ allprojects { prj ->
4141
}
4242
}
4343

44-
if (System.getenv("SITEMESH_MAVEN_PASSWORD") && prj.name == 'grails-plugin-gsp' && !sitemeshVersion.endsWith('-SNAPSHOT')) {
44+
if (System.getenv("GITHUB_MAVEN_PASSWORD") && prj.name == 'grails-plugin-gsp' && !sitemeshVersion.endsWith('-SNAPSHOT')) {
4545
System.out.println("Adding Sitemesh Repo")
4646
maven {
4747
url = 'https://maven.pkg.github.com/codeconsole/grails-plugin-sitemesh3'
4848
credentials {
4949
username = 'DOES_NOT_MATTER'
50-
password = System.getenv("SITEMESH_MAVEN_PASSWORD")
50+
password = System.getenv("GITHUB_MAVEN_PASSWORD")
51+
}
52+
}
53+
}
54+
55+
if (System.getenv("GITHUB_MAVEN_PASSWORD") && !grailsVersion.endsWith('-SNAPSHOT')) {
56+
System.out.println("Adding Grails Core Repo")
57+
maven {
58+
url = 'https://maven.pkg.github.com/grails/grails-core'
59+
credentials {
60+
username = 'DOES_NOT_MATTER'
61+
password = System.getenv("GITHUB_MAVEN_PASSWORD")
5162
}
5263
}
5364
}

gradle.properties

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
title=Groovy Server Pages (GSP)
22
authors=Puneet Behl
3-
projectVersion=7.0.0-SNAPSHOT
3+
projectVersion=7.0.0-M1
44
projectDesc=GSP (Groovy Server Pages) - A server-side view rendering technology based on Groovy
55
projectUrl=https://github.com/grails/grails-gsp
66
githubSlug=grails/grails-gsp
@@ -10,12 +10,12 @@ developers=Puneet Behl, Graeme Rocher
1010
commonsTextVersion=1.13.0
1111
elApiVersion=6.0.1
1212
grailsGradlePluginVersion=7.0.0-SNAPSHOT
13-
grailsVersion=7.0.0-SNAPSHOT
13+
grailsVersion=7.0.0-M1
1414
groovyVersion=4.0.24
1515
jspApiVersion=4.0.0
1616
jstlVersion=3.0.1
1717
servletApiVersion=6.0.0
18-
sitemeshVersion=7.0.0-SNAPSHOT
18+
sitemeshVersion=7.0.0-M1
1919
controllersRef=https://docs.grails.org/latest/ref/Controllers
2020
commandLineRef=https://docs.grails.org/latest/ref/Command%20Line
2121
grailsDocsVersion=7.0.0-SNAPSHOT

0 commit comments

Comments
 (0)