Skip to content

Commit 30b300d

Browse files
committed
Merge pull request #23 from jGleitz/fix-realease
ci: Fix GitHub Package publishing edit to trigger release
2 parents f505042 + cebcf6f commit 30b300d

File tree

3 files changed

+13
-10
lines changed

3 files changed

+13
-10
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
run: ./gradlew build
3535

3636
release:
37-
name: Release
37+
name: Release Check
3838
runs-on: ubuntu-latest
3939
needs: build
4040
if: github.ref == 'refs/heads/master'
@@ -45,7 +45,7 @@ jobs:
4545
uses: actions/setup-node@v1
4646
with:
4747
node-version: 12
48-
- name: Release
48+
- name: Release Check
4949
env:
5050
GITHUB_TOKEN: ${{ secrets.RELEASE_GITHUB_TOKEN }}
5151
run: npx semantic-release@17

.github/workflows/release.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ on:
55
types: [published]
66

77
jobs:
8-
publish:
9-
name: Publish Artefacts
8+
release:
9+
name: Release Artefacts
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout
@@ -25,13 +25,17 @@ jobs:
2525
java-version: 13
2626
- name: Prepare
2727
run: ./gradlew clean dependencies
28-
- name: Release to Maven Central
28+
- name: Assemble Artefacts
29+
run: ./gradlew assemble
30+
env:
31+
ORG_GRADLE_PROJECT_githubRepository: ${{ github.repository }}
32+
- name: Release Artefacts
2933
run: ./gradlew release
3034
env:
3135
ORG_GRADLE_PROJECT_signingKey: ${{ secrets.PACKAGE_SIGNING_KEY }}
3236
ORG_GRADLE_PROJECT_signingKeyPassword: ${{ secrets.PACKAGE_SIGNING_KEY_PASSWORD }}
3337
ORG_GRADLE_PROJECT_githubRepository: ${{ github.repository }}
34-
ORG_GRADLE_PROJECT_githubToken: ${{ github.token }}
38+
ORG_GRADLE_PROJECT_githubToken: ${{ secrets.RELEASE_GITHUB_TOKEN }}
3539
ORG_GRADLE_PROJECT_ossrhUsername: ${{ secrets.OSSRH_USERNAME }}
3640
ORG_GRADLE_PROJECT_ossrhPassword: ${{ secrets.OSSRH_PASSWORD }}
3741

@@ -55,7 +59,7 @@ jobs:
5559
java-version: 13
5660
- name: Prepare
5761
run: ./gradlew clean dependencies
58-
- name: Assemble
62+
- name: Generate Documentation
5963
run: ./gradlew dokka
6064
env:
6165
ORG_GRADLE_PROJECT_githubRepository: ${{ github.repository }}

build.gradle.kts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,13 +156,11 @@ nexusStaging {
156156

157157
val closeAndReleaseRepository by project.tasks
158158
closeAndReleaseRepository.mustRunAfter(mavenCentral.publishTask)
159-
val publish by tasks
160-
161159

162160
task("release") {
163161
group = "release"
164162
description = "Releases the project to Maven Central"
165-
dependsOn(publish, closeAndReleaseRepository)
163+
dependsOn(githubPackages.publishTask, mavenCentral.publishTask, closeAndReleaseRepository)
166164
}
167165

168166
idea {
@@ -179,4 +177,5 @@ fun String.drop(prefix: String) = if (this.startsWith(prefix)) this.drop(prefix.
179177
val Project.versionDetails
180178
get() = (this.extra["versionDetails"] as groovy.lang.Closure<*>)() as com.palantir.gradle.gitversion.VersionDetails
181179

180+
val ArtifactRepository.publishTask get() = tasks["publishAllPublicationsTo${this.name}Repository"]
182181
val NexusRepository.publishTask get() = tasks["publishTo${this.name.capitalize()}"]

0 commit comments

Comments
 (0)