From 7e1b8e93fa5ecb6814ec46dac6b5031dbadb41eb Mon Sep 17 00:00:00 2001 From: Adam Novak Date: Wed, 2 Nov 2022 21:42:02 -0400 Subject: [PATCH] Upgrade our source of Gradle and try to watch its resources --- .github/workflows/iceraven-build.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/iceraven-build.yml b/.github/workflows/iceraven-build.yml index 2c38195b0c2f..c8411c2805b2 100644 --- a/.github/workflows/iceraven-build.yml +++ b/.github/workflows/iceraven-build.yml @@ -16,7 +16,7 @@ jobs: with: fetch-depth: 0 - name: Setup Java - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: java-version: 11 - name: Install Android SDK with pieces Gradle skips @@ -26,16 +26,17 @@ jobs: - name: Create version name run: echo "VERSION_NAME=$(git describe --tags HEAD)" >> $GITHUB_ENV - name: Build forkRelease variant of app - uses: eskatos/gradle-command-action@v1 + uses: gradle/gradle-build-action@v2 env: # Try to stop the daemon from magically vanishing by adding random memory-related arguments. # See and - GRADLE_OPTS: -Dorg.gradle.jvmargs="-XX:MaxMetaspaceSize=1g -Xms4096m -Xmx8192m -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/dev/stderr" + # The runner seems to have ~6 gigs of memory, so we make sure to stay under that. + # We have Java 11 so we don't have a perm size anymore. + GRADLE_OPTS: -Dorg.gradle.jvmargs="-XX:MaxMetaspaceSize=5g -Xms4096m -Xmx5800m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/dev/stderr" with: - wrapper-cache-enabled: true - dependencies-cache-enabled: true - configuration-cache-enabled: true - arguments: app:assembleForkRelease -PversionName=${{ env.VERSION_NAME }} --stacktrace + gradle-home-cache-cleanup: true + gradle-executable: /usr/bin/time + arguments: -v ./gradlew app:assembleForkRelease -PversionName=${{ env.VERSION_NAME }} --stacktrace - name: Create signed APKs if: "contains(toJSON(github.event.ref_type), 'tag') && contains(toJSON(github.event.ref), 'iceraven')"