diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a60099c62..e7498165e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,7 +25,7 @@ jobs: os: [ ubuntu-latest, windows-latest, macos-latest ] env: NDK_CCACHE: ${{ github.workspace }}/ccache - CCACHE_DIR: ${{ github.workspace }}/.ccache + CCACHE_DIR: ~/.ccache steps: - name: Check out @@ -47,25 +47,27 @@ jobs: - name: Set up ccache run: bash .github/ccache.sh - - name: Cache Gradle + - name: Cache Gradle dependencies uses: actions/cache@v2 with: path: | ~/.gradle/caches ~/.gradle/wrapper + !~/.gradle/caches/build-cache-* key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }} restore-keys: ${{ runner.os }}-gradle- - - name: Cache ccache - id: ccache-cache + - name: Cache build cache uses: actions/cache@v2 with: - path: ${{ github.workspace }}/.ccache - key: ${{ runner.os }}-ccache-${{ github.sha }} - restore-keys: ${{ runner.os }}-ccache- + path: | + ~/.ccache + ~/.gradle/caches/build-cache-* + key: ${{ runner.os }}-build-cache-${{ github.sha }} + restore-keys: ${{ runner.os }}-build-cache- - name: Set up NDK - run: python build.py ndk + run: python build.py -v ndk - name: Build release run: | diff --git a/build.py b/build.py index 3ccac1ff2..6e34abeb0 100755 --- a/build.py +++ b/build.py @@ -431,7 +431,7 @@ def setup_ndk(args): rm_rf(ndk_path) with zipfile.ZipFile(ndk_zip, 'r') as zf: for info in zf.infolist(): - print(f'Extracting {info.filename}') + vprint(f'Extracting {info.filename}') if info.external_attr == 2716663808: # symlink src = zf.read(info).decode("utf-8") dest = op.join(ndk_root, info.filename) diff --git a/gradle.properties b/gradle.properties index a3ec67545..39634906c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,6 +17,9 @@ org.gradle.jvmargs=-Xmx2560m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects org.gradle.parallel=true +# Enable build cache +org.gradle.caching=true + # Android android.useAndroidX=true android.enableJetifier=false