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

Commit 3bf6097

Browse files
authored
Improvements to GitHub Workflows (#702)
* Update Gradle Task fetchSource * Update dependabot.yml * Update release.yml
1 parent 72263aa commit 3bf6097

File tree

3 files changed

+29
-22
lines changed

3 files changed

+29
-22
lines changed

.github/dependabot.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ updates:
66
interval: "daily"
77
labels:
88
- "type: dependency upgrade"
9-
- package-ecosystem: gradle
10-
directory: "/"
11-
schedule:
12-
interval: daily
13-
open-pull-requests-limit: 10
14-
target-branch: 7.0.x
15-
ignore:
16-
- dependency-name: com.gradle.build-scan
17-
versions:
18-
- 3.5.1
19-
- "3.6"
9+
- package-ecosystem: gradle
10+
directory: "/"
11+
schedule:
12+
interval: daily
13+
open-pull-requests-limit: 10
14+
target-branch: 7.0.x
15+
ignore:
16+
- dependency-name: com.gradle.build-scan
17+
versions:
18+
- 3.5.1
19+
- "3.6"

.github/workflows/release.yml

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,12 @@ jobs:
2929
uses: micronaut-projects/github-actions/pre-release@master
3030
with:
3131
token: ${{ secrets.GITHUB_TOKEN }}
32+
- name: Generate secring file
33+
env:
34+
SECRING_FILE: ${{ secrets.SECRING_FILE }}
35+
run: echo $SECRING_FILE | base64 -d > ${{ github.workspace }}/secring.gpg
3236
- name: Publish to Sonatype OSSRH
3337
env:
34-
TAGGED_VERSION: ${{ steps.release_version.outputs.release_version }}
3538
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
3639
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
3740
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
@@ -42,13 +45,18 @@ jobs:
4245
ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
4346
SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
4447
SIGNING_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }}
45-
SECRING_FILE: ${{ secrets.SECRING_FILE }}
46-
run: |
47-
echo $SECRING_FILE | base64 -d > secring.gpg
48-
echo "Publishing Artifacts"
49-
(set -x; ./gradlew -Psigning.secretKeyRingFile="${GITHUB_WORKSPACE}/secring.gpg" publishToSonatype closeAndReleaseSonatypeStagingRepository --no-daemon)
50-
echo "Publishing Documentation"
51-
./gradlew docs:docs
48+
with:
49+
arguments: -Psigning.secretKeyRingFile="${GITHUB_WORKSPACE}/secring.gpg" publishToSonatype closeAndReleaseSonatypeStagingRepository --no-daemon
50+
- name: Publish Documentation
51+
id: docs
52+
if: steps.publish.outcome == 'success'
53+
uses: gradle/gradle-build-action@v2
54+
env:
55+
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
56+
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
57+
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
58+
with:
59+
arguments: docs:docs
5260
- name: Export Gradle Properties
5361
uses: micronaut-projects/github-actions/export-gradle-properties@master
5462
- name: Determine docs target repository

docs/build.gradle

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,8 @@ task fetchSource {
7777

7878
doLast {
7979
println "Downloading GORM source code."
80-
def tag = System.getenv('TAGGED_VERSION')
81-
if (tag) {
82-
ant.get src: "https://github.com/grails/grails-data-mapping/archive/${tag}.zip", dest: zipFile, verbose: true
80+
if (isReleaseVersion) {
81+
ant.get src: "https://github.com/grails/grails-data-mapping/archive/${gormVersion}.zip", dest: zipFile, verbose: true
8382
} else {
8483
ant.get src: "https://github.com/grails/grails-data-mapping/zipball/${githubBranch}", dest: zipFile, verbose: true
8584
}

0 commit comments

Comments
 (0)