Update signing config for release

ajoberstar · Nov 30, 2021 · 1edea6a · 1edea6a
1 parent 0da1430
commit 1edea6a
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 32 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -1,8 +1,7 @@
 name: Release
 on:
   push:
-    tags:
-      - "*"
+    tags: ["*"]
 jobs:
   check:
     runs-on: ubuntu-latest
@@ -11,57 +10,61 @@ jobs:
         java: [8, 11, 15]
       fail-fast: false
     steps:
-      - name: "Checkout repo"
-        uses: "actions/checkout@v2"
+      - name: Checkout repo
+        uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: "Setup Java ${{ matrix.java }}"
-        uses: "actions/setup-java@v1"
+      - name: Setup Java ${{ matrix.java }}
+        uses: actions/setup-java@v2
         with:
+          distribution: zulu
           java-version: ${{ matrix.java }}
-      - name: "Validate Gradle Wrapper"
+      - name: Validate Gradle Wrapper
         uses: gradle/wrapper-validation-action@v1
-      - name: "Cache Gradle wrapper"
-        uses: "actions/cache@v2"
+      - name: Cache Gradle wrapper
+        uses: actions/cache@v2
         with:
           path: |
             ~/.gradle/wrapper
             ~/.gradle/notifications
-          key: "gradle-wrapper-${{ runner.os }}-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}"
-      - name: "Cache Gradle dependencies"
-        uses: "actions/cache@v2"
+          key: gradle-wrapper-${{ runner.os }}-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
+      - name: Cache Gradle dependencies
+        uses: actions/cache@v2
         with:
-          path: "~/.gradle/caches"
-          key: "gradle-caches-${{ runner.os }}-${{ hashFiles('**/gradle/dependency-locks/*.lockfile') }}"
-      - name: "Gradle check"
-        run: "./gradlew check --continue"
+          path: ~/.gradle/caches
+          key: gradle-caches-${{ runner.os }}-${{ hashFiles('**/gradle/dependency-locks/*.lockfile') }}
+      - name: Gradle check
+        run: ./gradlew check --continue
   publish:
     runs-on: ubuntu-latest
     needs: check
     steps:
-      - name: "Checkout repo"
-        uses: "actions/checkout@v2"
+      - name: Checkout repo
+        uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: "Setup Java"
-        uses: "actions/setup-java@v1"
+      - name: Setup Java
+        uses: actions/setup-java@v2
         with:
+          distribution: zulu
           java-version: 8
-      - name: "Cache Gradle wrapper"
-        uses: "actions/cache@v2"
+      - name: Cache Gradle wrapper
+        uses: actions/cache@v2
         with:
           path: |
             ~/.gradle/wrapper
             ~/.gradle/notifications
-          key: "gradle-wrapper-${{ runner.os }}-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}"
-      - name: "Cache Gradle dependencies"
-        uses: "actions/cache@v2"
+          key: gradle-wrapper-${{ runner.os }}-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
+      - name: Cache Gradle dependencies
+        uses: actions/cache@v2
         with:
-          path: "~/.gradle/caches"
-          key: "gradle-caches-${{ runner.os }}-${{ hashFiles('**/gradle/dependency-locks/*.lockfile') }}"
-      - name: "Gradle publish"
+          path: ~/.gradle/caches
+          key: gradle-caches-${{ runner.os }}-${{ hashFiles('**/gradle/dependency-locks/*.lockfile') }}
+      - name: Gradle publish
         env:
-          BINTRAY_USER: ${{ secrets.BINTRAY_USER }}
-          BINTRAY_KEY: ${{ secrets.BINTRAY_KEY }}
+          OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+          OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
+          ORG_GRADLE_PROJECT_signingKey: ${{ secrets.PGP_SIGNING_KEY }}
+          ORG_GRADLE_PROJECT_signingPassphrase: ${{ secrets.PGP_SIGNING_PASSPHRASE }}
           GRADLE_OPTS: "-Dorg.gradle.project.gradle.publish.key=${{ secrets.GRADLE_PLUGIN_KEY }} -Dorg.gradle.project.gradle.publish.secret=${{ secrets.GRADLE_PLUGIN_SECRET }}"
-        run: "./gradlew publish publishPlugins"
+        run: ./gradlew publishToCentralReleases publishPlugins
diff --git a/buildSrc/src/main/kotlin/java-library-convention.gradle.kts b/buildSrc/src/main/kotlin/java-library-convention.gradle.kts
@@ -83,6 +83,8 @@ publishing {
 
 signing {
   setRequired(System.getenv("CI"))
-  useGpgCmd()
+  val signingKey: String? by project
+  val signingPassphrase: String? by project
+  useInMemoryPgpKeys(signingKey, signingPassphrase)
   sign(publishing.publications["main"])
 }