Merge branch '2020.1' into 2020.2

minecraft-dev · May 14, 2021 · 99164b7 · 99164b7
2 parents 0cdd978 + 4fbdd2e
commit 99164b7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -2,7 +2,7 @@ name: Publish Plugin
 on:
   push:
     tags:
-      - '[0-9].[0-9].[0-9]-[0-9][0-9][0-9][0-9].[1-3]'
+      - '*'
 
 jobs:
   publish:
@@ -20,7 +20,7 @@ jobs:
             ~/.gradle/jdks
             ~/.gradle/native
             ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('gradle.properties') }}
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', 'gradle/**', 'gradle.properties') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
       - name: Setup publish token

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -27,7 +27,7 @@ jobs:
             ~/.gradle/jdks
             ~/.gradle/native
             ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('gradle.properties') }}
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', 'gradle/**', 'gradle.properties') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
       - run: ./gradlew build --no-daemon --stacktrace