fix(java): cache common files (#427)

algolia · Apr 27, 2022 · cdafe8b · cdafe8b
1 parent acca4d2
commit cdafe8b
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 25 deletions.
diff --git a/.github/.cache_version b/.github/.cache_version
@@ -1 +1 @@
-8.0.11
+9.1
diff --git a/.github/actions/cache/action.yml b/.github/actions/cache/action.yml
@@ -381,15 +381,16 @@ runs:
           )}}
 
     # Restore Java clients: used during 'cts' or 'codegen'
-    - name: Restore Java client gradle properties
+    - name: Restore Java client gradle files
       if: ${{ inputs.job == 'cts' || inputs.job == 'codegen' || (inputs.job == 'client' && inputs.language == 'java') }}
       uses: actions/cache@v2
       with:
-        path: clients/algoliasearch-client-java-2/gradle.properties
+        path: |
+          clients/algoliasearch-client-java-2/gradle*
+          clients/algoliasearch-client-java-2/gradle/*
         key: |
-          ${{ env.CACHE_VERSION }}-${{
+          ${{ env.CACHE_VERSION }}-java-common-${{
           hashFiles(
-            'specs/bundled/search.yml',
             'templates/java/**',
             'generators/src/**'
           )}}

diff --git a/config/generation.config.js b/config/generation.config.js
@@ -11,6 +11,7 @@ module.exports = {
 
     // Java
     '!clients/algoliasearch-client-java-2/*.gradle',
+    '!clients/algoliasearch-client-java-2/.gitignore',
     '!clients/algoliasearch-client-java-2/algoliasearch-core/build.gradle',
     '!clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/exceptions/*',
     '!clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/utils/*',

diff --git a/generators/src/main/java/com/algolia/codegen/AlgoliaJavaGenerator.java b/generators/src/main/java/com/algolia/codegen/AlgoliaJavaGenerator.java
@@ -238,7 +238,8 @@ public void processOpts() {
 
     supportingFiles.removeIf(file ->
       file.getTemplateFile().equals("build.gradle.mustache") ||
-      file.getTemplateFile().equals("settings.gradle.mustache")
+      file.getTemplateFile().equals("settings.gradle.mustache") ||
+      file.getTemplateFile().equals("gitignore.mustache")
     );
   }
 

diff --git a/templates/java/gitignore.mustache b/templates/java/gitignore.mustache