Merge pull request #152 from amosproj/ci-v2

CI: do not cache separate build dirs
amosproj · Dec 10, 2024 · 027d6eb · 027d6eb
2 parents cba3104 + a28ffee
commit 027d6eb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/.github/actions/setup-gradle-cache/action.yml b/.github/actions/setup-gradle-cache/action.yml
@@ -18,9 +18,6 @@ runs:
       with:
         path: |
           frontend/.gradle
-          frontend/app/build
-          frontend/client/build
-          frontend/build
         key: ${{ github.repository }}-${{ runner.os }}-gradle-${{ github.job }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
         restore-keys: |
           ${{ github.repository }}-${{ runner.os }}-gradle-

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -110,4 +110,8 @@ jobs:
       - name: Gradle Lint
         run: | 
           cd frontend
-          nix develop --command ./gradlew build --no-daemon --parallel
+          nix develop --command ./gradlew build \
+            --no-daemon \
+            --parallel \
+            --build-cache \
+            -Dorg.gradle.jvmargs=-Xmx4G
diff --git a/frontend/gradle.properties b/frontend/gradle.properties
@@ -26,6 +26,3 @@ kotlin.code.style=official
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
-org.gradle.parallel=true
-org.gradle.configuration-cache=true
-org.gradle.caching=true