diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 4c8f3d2..59c8635 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -8,6 +8,8 @@ env: JAVA_DISTRIBUTION: 'zulu' ORG_GRADLE_PROJECT_ossrhUsername: ${{ secrets.OSSRH_USERNAME}} ORG_GRADLE_PROJECT_ossrhPassword: ${{ secrets.OSSRH_PASSWORD}} + ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGN_SECRET_KEY }} + ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGN_SECRET_PWD }} jobs: publish-base: @@ -24,11 +26,6 @@ jobs: - uses: gradle/gradle-build-action@v2 - - name: Import key - run: echo "${{ secrets.SIGN_SECRET_KEY }}" | gpg --batch --import - env: - GPG_TTY: ${{ env.tty }} - - name: Publish Multiplatform release run: ./gradlew publishKotlinMultiplatformPublicationToOSSRHRepository @@ -55,17 +52,9 @@ jobs: - uses: gradle/gradle-build-action@v2 - - name: Import key - run: echo "${{ secrets.SIGN_SECRET_KEY }}" | gpg --batch --import - env: - GPG_TTY: ${{ env.tty }} - - name: Publish Linux x64 release run: ./gradlew publishLinuxX64PublicationToOSSRHRepository - - name: Delete GnuPG data - run: rm -rfv $HOME/.gnupg - publish-mac: runs-on: macos-latest strategy: @@ -86,17 +75,9 @@ jobs: - uses: gradle/gradle-build-action@v2 - - name: Import key - run: echo "${{ secrets.SIGN_SECRET_KEY }}" | gpg --batch --import - env: - GPG_TTY: ${{ env.tty }} - - name: Publish run: ./gradlew ${{ matrix.target }} - - name: Delete GnuPG data - run: rm -rfv $HOME/.gnupg - publish-windows: runs-on: windows-latest steps: @@ -111,13 +92,5 @@ jobs: - uses: gradle/gradle-build-action@v2 - - name: Import key - run: echo "${{ secrets.SIGN_SECRET_KEY }}" | gpg --batch --import - - name: Publish MinGW x64 release - run: ./gradlew publishMingwX64PublicationToOSSRHRepository - - - name: Delete GnuPG data - uses: JesseTG/rm@v1.0.3 - with: - path: ~/.gnupg + run: ./gradlew publishMingwX64PublicationToOSSRHRepository \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/buildsrc/conventions/publishing.gradle.kts b/buildSrc/src/main/kotlin/buildsrc/conventions/publishing.gradle.kts index c5eeb61..5952514 100644 --- a/buildSrc/src/main/kotlin/buildsrc/conventions/publishing.gradle.kts +++ b/buildSrc/src/main/kotlin/buildsrc/conventions/publishing.gradle.kts @@ -85,7 +85,10 @@ publishing { } signing { - useGpgCmd() + val signingKey: String? by project + val signingPassword: String? by project + useInMemoryPgpKeys(signingKey, signingPassword) + sign(publishing.publications) setRequired({