diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 4528b2de347..53926182f4e 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -26,6 +26,7 @@ jobs: env: DEVELOCITY_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }} DEVELOCITY_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }} + GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }} publish: if: github.event_name == 'push' needs: ["build"] diff --git a/.github/workflows/groovy-joint-workflow.yml b/.github/workflows/groovy-joint-workflow.yml index 0df66850cbd..18daee4c379 100644 --- a/.github/workflows/groovy-joint-workflow.yml +++ b/.github/workflows/groovy-joint-workflow.yml @@ -108,6 +108,7 @@ jobs: env: DEVELOCITY_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }} DEVELOCITY_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }} + GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }} run: | cd groovy ./gradlew pTML -x groovydoc -x javadoc -x javadocAll -x groovydocAll -x asciidoc -x docGDK @@ -138,6 +139,7 @@ jobs: env: DEVELOCITY_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }} DEVELOCITY_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }} + GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }} run: > ./gradlew build -PgroovyVersion=${{needs.build_groovy.outputs.groovyVersion}} diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml index 83520b41601..f5966bc3375 100644 --- a/.github/workflows/release-notes.yml +++ b/.github/workflows/release-notes.yml @@ -31,8 +31,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 index e36b406379a..3c54da5f2c3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,7 +22,7 @@ jobs: distribution: liberica java-version: 17 - 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: Extract Target Branch @@ -46,6 +46,7 @@ jobs: env: DEVELOCITY_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }} DEVELOCITY_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 @@ -71,6 +72,7 @@ jobs: SIGNING_KEY: ${{ secrets.SIGNING_KEY }} SIGNING_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }} SECRING_FILE: ${{ secrets.SECRING_FILE }} + GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }} release: needs: publish runs-on: ubuntu-latest @@ -96,9 +98,10 @@ jobs: SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }} + GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }} - 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: diff --git a/build.gradle b/build.gradle index 7f810285a9f..9832280ee7f 100644 --- a/build.gradle +++ b/build.gradle @@ -48,6 +48,16 @@ allprojects { url = 'https://repository.apache.org/content/repositories/snapshots' } } + 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") + } + } + } } configurations { diff --git a/gradle.properties b/gradle.properties index e94df1108dc..c7121862402 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,7 +13,7 @@ jakartaElGlassfishImplVersion=4.0.2 gradleNexusPluginVersion=2.3.1 gradleNexusPublishPluginVersion=1.3.0 grailsAsyncVersion=6.0.0-M1 -grailsVersion=7.0.0-SNAPSHOT +grailsVersion=7.0.0-M1 groovyVersion=4.0.24 hibernateValidatorVersion=7.0.5.Final javassistVersion=3.30.2-GA