Update actions

lukebemishprojects · Apr 27, 2024 · 527788a · 527788a
1 parent 769127f
commit 527788a
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 13 deletions.
diff --git a/.github/workflows/build_pr.yml b/.github/workflows/build_pr.yml
@@ -5,7 +5,7 @@
             "steps": [
                 {
                     "name": "Setup Java",
-                    "run": "echo \"JAVA_HOME=$JAVA_HOME_17_X64\" >> \"$GITHUB_ENV\""
+                    "run": "echo \"JAVA_HOME=$JAVA_HOME_21_X64\" >> \"$GITHUB_ENV\""
                 },
                 {
                     "with": {
@@ -15,9 +15,13 @@
                     "name": "Checkout",
                     "uses": "actions/checkout@v4"
                 },
+                {
+                    "name": "Validate Gradle Wrapper",
+                    "uses": "gradle/actions/wrapper-validation@v3"
+                },
                 {
                     "with": {
-                        "path": "**/.gradle/loom-cache",
+                        "path": "**/.gradle/loom-cache\n**/.gradle/quilt-loom-cache",
                         "key": "${{ runner.os }}-gradle-${{ hashFiles('**/libs.versions.*', '**/*.gradle*', '**/gradle-wrapper.properties') }}",
                         "restore-keys": "${{ runner.os }}-gradle-"
                     },
@@ -30,7 +34,7 @@
                         "gradle-home-cache-cleanup": true
                     },
                     "name": "Setup Gradle",
-                    "uses": "gradle/gradle-build-action@v3"
+                    "uses": "gradle/actions/setup-gradle@v3"
                 },
                 {
                     "name": "Build",

diff --git a/.github/workflows/publish_pr.yml b/.github/workflows/publish_pr.yml
@@ -34,7 +34,7 @@
                         "MAVEN_PASSWORD": "${{ secrets.PR_MAVEN_PASSWORD }}",
                         "MAVEN_URL": "https://maven.lukebemish.dev/pullrequests/",
                         "ALLOWED_VERSION": "*-pr${{ github.event.workflow_run.pull_requests[0].number }}",
-                        "ALLOWED_PATHS": "dev/lukebemish/defaultresources/defaultresources-*"
+                        "ALLOWED_PATHS": "dev/lukebemish/defaultresources"
                     }
                 }
             ],

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -11,7 +11,7 @@
             "steps": [
                 {
                     "name": "Setup Java",
-                    "run": "echo \"JAVA_HOME=$JAVA_HOME_17_X64\" >> \"$GITHUB_ENV\""
+                    "run": "echo \"JAVA_HOME=$JAVA_HOME_21_X64\" >> \"$GITHUB_ENV\""
                 },
                 {
                     "with": {
@@ -20,9 +20,13 @@
                     "name": "Checkout",
                     "uses": "actions/checkout@v4"
                 },
+                {
+                    "name": "Validate Gradle Wrapper",
+                    "uses": "gradle/actions/wrapper-validation@v3"
+                },
                 {
                     "with": {
-                        "path": "**/.gradle/loom-cache",
+                        "path": "**/.gradle/loom-cache\n**/.gradle/quilt-loom-cache",
                         "key": "${{ runner.os }}-gradle-${{ hashFiles('**/libs.versions.*', '**/*.gradle*', '**/gradle-wrapper.properties') }}",
                         "restore-keys": "${{ runner.os }}-gradle-"
                     },
@@ -34,7 +38,7 @@
                         "gradle-home-cache-cleanup": true
                     },
                     "name": "Setup Gradle",
-                    "uses": "gradle/gradle-build-action@v3"
+                    "uses": "gradle/actions/setup-gradle@v3"
                 },
                 {
                     "uses": "fregante/setup-git-user@v2"
@@ -87,7 +91,7 @@
             "steps": [
                 {
                     "name": "Setup Java",
-                    "run": "echo \"JAVA_HOME=$JAVA_HOME_17_X64\" >> \"$GITHUB_ENV\""
+                    "run": "echo \"JAVA_HOME=$JAVA_HOME_21_X64\" >> \"$GITHUB_ENV\""
                 },
                 {
                     "with": {
@@ -98,9 +102,13 @@
                     "name": "Checkout",
                     "uses": "actions/checkout@v4"
                 },
+                {
+                    "name": "Validate Gradle Wrapper",
+                    "uses": "gradle/actions/wrapper-validation@v3"
+                },
                 {
                     "with": {
-                        "path": "**/.gradle/loom-cache",
+                        "path": "**/.gradle/loom-cache\n**/.gradle/quilt-loom-cache",
                         "key": "${{ runner.os }}-gradle-${{ hashFiles('**/libs.versions.*', '**/*.gradle*', '**/gradle-wrapper.properties') }}",
                         "restore-keys": "${{ runner.os }}-gradle-"
                     },
@@ -113,7 +121,7 @@
                         "gradle-home-cache-cleanup": true
                     },
                     "name": "Setup Gradle",
-                    "uses": "gradle/gradle-build-action@v3"
+                    "uses": "gradle/actions/setup-gradle@v3"
                 },
                 {
                     "name": "Publish",

diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
@@ -5,7 +5,7 @@
             "steps": [
                 {
                     "name": "Setup Java",
-                    "run": "echo \"JAVA_HOME=$JAVA_HOME_17_X64\" >> \"$GITHUB_ENV\""
+                    "run": "echo \"JAVA_HOME=$JAVA_HOME_21_X64\" >> \"$GITHUB_ENV\""
                 },
                 {
                     "with": {
@@ -15,9 +15,13 @@
                     "name": "Checkout",
                     "uses": "actions/checkout@v4"
                 },
+                {
+                    "name": "Validate Gradle Wrapper",
+                    "uses": "gradle/actions/wrapper-validation@v3"
+                },
                 {
                     "with": {
-                        "path": "**/.gradle/loom-cache",
+                        "path": "**/.gradle/loom-cache\n**/.gradle/quilt-loom-cache",
                         "key": "${{ runner.os }}-gradle-${{ hashFiles('**/libs.versions.*', '**/*.gradle*', '**/gradle-wrapper.properties') }}",
                         "restore-keys": "${{ runner.os }}-gradle-"
                     },
@@ -30,7 +34,7 @@
                         "gradle-home-cache-cleanup": true
                     },
                     "name": "Setup Gradle",
-                    "uses": "gradle/gradle-build-action@v3"
+                    "uses": "gradle/actions/setup-gradle@v3"
                 },
                 {
                     "name": "Build",