Merge branch 'refs/heads/master' into 1.20.1

# Conflicts: # .github/workflows/gradle.yml # .github/workflows/publish.yml
Jerozgen · May 12, 2024 · e25b42e · e25b42e
2 parents fa59629 + 60e57b6
commit e25b42e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -1,23 +1,23 @@
 name: Java CI
 
-on: [pull_request]
+on: [pull_request, workflow_dispatch]
 
 jobs:
   build:
     name: Build
     runs-on: ubuntu-latest
     if: "! contains(toJSON(github.event.head_commit.message), '[Skip CI]')"
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
           java-version: 17
 
       - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/wrapper-validation-action@v2
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
@@ -26,7 +26,7 @@ jobs:
         run: ./gradlew build
 
       - name: Upload build artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Language Reload
           path: build/libs
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -9,16 +9,16 @@ jobs:
   upload:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
           java-version: 17
 
       - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/wrapper-validation-action@v2
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
@@ -27,7 +27,7 @@ jobs:
         run: ./gradlew build
 
       - name: Upload build artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Language Reload
           path: build/libs