diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index cc83052..7fa2fa7 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -71,4 +71,4 @@ jobs: shell: bash env: PGP_KEY_PRIVATE: ${{secrets.S_PGP_KEY_PRIVATE}} - - run: './gradlew --no-daemon publishRelease -PdevBuildNumber=${{ github.run_number }} -PpearxRepoUsername=${{ secrets.S_PEARX_REPO_USERNAME }} -PpearxRepoPassword=${{ secrets.S_PEARX_REPO_PASSWORD }} -Psigning.keyId=${{ secrets.S_PGP_KEY_PUBID }} -Psigning.password="${{ secrets.S_PGP_KEY_PASSWORD }}" -Psigning.secretKeyRingFile=private.key -PgithubAccessToken="${{ secrets.S_GITHUB_RELEASE_TOKEN }}" -PsonatypeOssUsername="${{ secrets.S_SONATYPE_OSS_USERNAME }}" -PsonatypeOssPassword="${{ secrets.S_SONATYPE_OSS_PASSWORD }}"' \ No newline at end of file + - run: './gradlew --no-daemon release -PdevBuildNumber=${{ github.run_number }} -PpearxRepoUsername=${{ secrets.S_PEARX_REPO_USERNAME }} -PpearxRepoPassword=${{ secrets.S_PEARX_REPO_PASSWORD }} -Psigning.keyId=${{ secrets.S_PGP_KEY_PUBID }} -Psigning.password="${{ secrets.S_PGP_KEY_PASSWORD }}" -Psigning.secretKeyRingFile=private.key -PgithubAccessToken="${{ secrets.S_GITHUB_RELEASE_TOKEN }}" -PsonatypeOssUsername="${{ secrets.S_SONATYPE_OSS_USERNAME }}" -PsonatypeOssPassword="${{ secrets.S_SONATYPE_OSS_PASSWORD }}"' \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 4f0df52..e917845 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -101,13 +101,17 @@ configure { } tasks { - register("publishDevelop") { + val publishDevelop by registering { group = "publishing" dependsOn(withType().matching { it.repository.name.endsWith("-develop") }) } - register("publishRelease") { + val publishRelease by registering { group = "publishing" dependsOn(withType().matching { it.repository.name.endsWith("-release") }) + } + val release by registering { + group = "publishing" + dependsOn(publishRelease) dependsOn(named("githubRelease")) } }