Simplify Github WorkFlows

Signed-off-by: Joseph T. McQuigg <[email protected]>
Potion-Studios · Dec 24, 2024 · 912ab0b · 912ab0b
1 parent 217fd60
commit 912ab0b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 23 deletions.
diff --git a/.github/workflows/gradle-pr-build.yml b/.github/workflows/gradle-pr-build.yml
@@ -1,7 +1,7 @@
 name: Build Gradle for Pull Request
 
 on:
-  pull-request:
+  pull_request:
     branches:
       - 1.21.1
       - 1.20.1
@@ -12,10 +12,8 @@ on:
 
 jobs:
   gradle:
-    strategy:
-      matrix:
-        os: [ ubuntu-latest ]
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
+
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK 21
@@ -25,11 +23,8 @@ jobs:
           java-version: 21
           cache: gradle
 
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
-
       - name: Change wrapper permissions
         run: chmod +x ./gradlew
 
       - name: Execute Gradle build
-        run: ./gradlew build  --scan
+        run: ./gradlew build --scan
diff --git a/.github/workflows/gradle-publishtomaven.yml b/.github/workflows/gradle-publishtomaven.yml
@@ -9,10 +9,8 @@ on:
 
 jobs:
   gradle:
-    strategy:
-      matrix:
-        os: [ ubuntu-latest ]
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
+
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK 21
@@ -22,20 +20,14 @@ jobs:
           java-version: 21
           cache: gradle
 
-      - name: Store gradle.properties secrets
-        env:
-          MAVEN_REPO_PROPERTIES: ${{ secrets.REPO_LOGIN }}
-        shell: bash
+      - name: Configure Gradle secrets
         run: |
           mkdir -p ~/.gradle/
           echo "GRADLE_USER_HOME=${HOME}/.gradle" >> $GITHUB_ENV
-          echo "${MAVEN_REPO_PROPERTIES}" > ~/.gradle/gradle.properties
-
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
+          echo "${{ secrets.REPO_LOGIN }}" > ~/.gradle/gradle.properties
 
       - name: Change wrapper permissions
         run: chmod +x ./gradlew
 
-      - name: Execute Gradle build and Publish to Maven
-        run: ./gradlew publish publishAllPublicationsToJTDev-Maven-RepositoryRepository
+      - name: Build and Publish to Maven
+        run: ./gradlew publish publishAllPublicationsToJTDev-Maven-RepositoryRepository