Merge pull request apple#10 from alexanderjordanbaker/CapitalizationU…

…pdates Updating auto publishing scripts
vpavic · Jun 23, 2023 · 24cb3fe · 24cb3fe
2 parents 5ef9c5e + 6e18cc9
commit 24cb3fe
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 22 deletions.
diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml
@@ -1,22 +1,18 @@
-name: PR Builder
+name: Release Builder
 on:
   release:
     types: [published]
 jobs:
   build:
-    name: JDK ${{ matrix.java }} ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        java: [ 11, 17, 20 ]
-        os: [ ubuntu-latest ]
+    name: JDK 17 Release Builder
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
         uses: actions/checkout@v3
-      - name: Set up JDK ${{ matrix.java }}
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: ${{ matrix.java }}
+          java-version: 17
           distribution: 'zulu'
           cache: 'gradle'
       - name: Print JDK Version
@@ -26,6 +22,10 @@ jobs:
       - name: Build
         env:
           JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF-8
+          ORG_GRADLE_PROJECT_mavenUsername: ${{ secrets.ORG_GRADLE_PROJECT_MAVENUSERNAME }}
+          ORG_GRADLE_PROJECT_mavenPassword: ${{ secrets.ORG_GRADLE_PROJECT_MAVENPASSWORD }}
+          ORG_GRADLE_PROJECT_signingKey: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGKEY }}
+          ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGPASSWORD }}
         run:  >
           sudo -E env "PATH=$PATH" bash -c "ulimit -l 65536 && ulimit -a &&
           ./gradlew --no-daemon --parallel clean check &&

diff --git a/.github/workflows/ci-snapshot.yml b/.github/workflows/ci-snapshot.yml
@@ -1,4 +1,4 @@
-name: PR Builder
+name: Snapshot Builder
 on:
   push:
     branches: [ main ]
@@ -7,19 +7,15 @@ on:
       - "[0-9]+.[0-9]+.[0-9]+.[0-9]+"
 jobs:
   build:
-    name: JDK ${{ matrix.java }} ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        java: [ 11, 17, 20 ]
-        os: [ ubuntu-latest ]
+    name: JDK 17 Snapshot Builder
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
         uses: actions/checkout@v3
-      - name: Set up JDK ${{ matrix.java }}
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: ${{ matrix.java }}
+          java-version: 17
           distribution: 'zulu'
           cache: 'gradle'
       - name: Print JDK Version
@@ -29,6 +25,10 @@ jobs:
       - name: Build
         env:
           JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF-8
+          ORG_GRADLE_PROJECT_mavenUsername: ${{ secrets.ORG_GRADLE_PROJECT_MAVENUSERNAME }}
+          ORG_GRADLE_PROJECT_mavenPassword: ${{ secrets.ORG_GRADLE_PROJECT_MAVENPASSWORD }}
+          ORG_GRADLE_PROJECT_signingKey: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGKEY }}
+          ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGPASSWORD }}
         run:  >
           sudo -E env "PATH=$PATH" bash -c "ulimit -l 65536 && ulimit -a &&
           ./gradlew properties --no-daemon --console=plain -q | grep -E '^version: [\.0-9]+\-SNAPSHOT$' &&

diff --git a/build.gradle b/build.gradle
@@ -24,8 +24,8 @@ java {
 }
 
 signing {
-    def signingKey = findProperty("SIGNINGKEY")
-    def signingPassword = findProperty("SIGNINGPASSWORD")
+    def signingKey = findProperty("signingKey")
+    def signingPassword = findProperty("signingPassword")
     useInMemoryPgpKeys(signingKey, signingPassword)
     sign publishing.publications
 }
@@ -58,8 +58,8 @@ publishing {
     repositories {
         maven {
             credentials {
-                username findProperty("MAVENUSERNAME")
-                password findProperty("MAVENPASSWORD")
+                username findProperty("mavenUsername")
+                password findProperty("mavenPassword")
             }
             if(project.version.endsWith('-SNAPSHOT')) {
                 url "https://s01.oss.sonatype.org/content/repositories/snapshots/"