diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml index 3b0b806b..bdbecceb 100644 --- a/.github/workflows/core.yml +++ b/.github/workflows/core.yml @@ -36,6 +36,15 @@ jobs: uses: actions/setup-java@v1 with: java-version: 11 + - name: Cache Gradle + uses: actions/cache@v2 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: gradle-core-${{ github.sha }} + restore-keys: | + gradle- - name: Cache Cmake uses: actions/cache@v2 with: @@ -44,19 +53,13 @@ jobs: restore-keys: ccache - name: Install ccache run: sudo apt-get install -y ccache - - uses: burrunan/gradle-cache-action@v1 - name: Build with Gradle - with: - job-id: core - arguments: | - zipRelease - zipDebug - gradle-version: wrapper - concurrent: true - properties: | - org.gradle.caching=true - org.gradle.parallel=true - org.gradle.vfs.watch=true + - name: Build with Gradle + run: | + echo 'org.gradle.caching=true' >> gradle.properties + echo 'org.gradle.parallel=true' >> gradle.properties + echo 'org.gradle.vfs.watch=true' >> gradle.properties + echo 'org.gradle.jvmargs=-Xmx2048m' >> gradle.properties + ./gradlew zipRelease zipDebug - name: Prepare artifact if: success() id: prepareArtifact diff --git a/.github/workflows/manager.yml b/.github/workflows/manager.yml index 37a113c2..be4ab8a2 100644 --- a/.github/workflows/manager.yml +++ b/.github/workflows/manager.yml @@ -35,20 +35,23 @@ jobs: echo androidKeyPassword='${{ secrets.KEY_PASSWORD }}' >> gradle.properties echo androidStoreFile='key.jks' >> gradle.properties echo ${{ secrets.KEY_STORE }} | base64 --decode > key.jks - - uses: burrunan/gradle-cache-action@v1 - name: Build with Gradle + - name: Cache Gradle + uses: actions/cache@v2 with: - job-id: manager - arguments: ":app:assembleRelease" - gradle-version: wrapper - concurrent: true - properties: | - org.gradle.caching=true - org.gradle.parallel=true - org.gradle.vfs.watch=true + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: gradle-manager-${{ github.sha }} + restore-keys: | + gradle- - name: Build with Gradle id: buildRelease run: | + echo 'org.gradle.caching=true' >> gradle.properties + echo 'org.gradle.parallel=true' >> gradle.properties + echo 'org.gradle.vfs.watch=true' >> gradle.properties + echo 'org.gradle.jvmargs=-Xmx2048m' >> gradle.properties + ./gradlew :app:assembleRelease echo "::set-output name=releaseName::`ls app/build/outputs/apk/release/LSPosed*-v*-release.apk | awk -F '(/|.apk)' '{print $6}'`" - name: Upload apk if: success() diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 1f71ddda..205362fb 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -167,6 +167,7 @@ task("buildLibcxx", Exec::class) { environment("NDK_CCACHE", it) environment("USE_CCACHE", "1") environment("CCACHE_COMPILERCHECK", "content") + environment("CCACHE_MAXSIZE", "100M") } ?: run { println("not using ccache") } diff --git a/core/src/main/cpp/CMakeLists.txt b/core/src/main/cpp/CMakeLists.txt index 98d021d8..a42d63a1 100644 --- a/core/src/main/cpp/CMakeLists.txt +++ b/core/src/main/cpp/CMakeLists.txt @@ -20,14 +20,16 @@ cmake_minimum_required(VERSION 3.4.1) -find_program( CCACHE ccache ) +find_program(CCACHE ccache) -if ( CCACHE ) - set( CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE} ) - set( CMAKE_C_COMPILER_LAUNCHER ${CCACHE} ) -else() - message( WARNING "Could not find CCache program." ) -endif() +if (CCACHE) + set(CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE}) + set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE}) + set(ENV{CCACHE_COMPILERCHECK} "content") + set(ENV{CCACHE_MAXSIZE} "100M") +else () + message(WARNING "Could not find CCache program.") +endif () link_libraries("-ffixed-x18") diff --git a/core/src/main/cpp/main/CMakeLists.txt b/core/src/main/cpp/main/CMakeLists.txt index df2a98a6..c204d92b 100644 --- a/core/src/main/cpp/main/CMakeLists.txt +++ b/core/src/main/cpp/main/CMakeLists.txt @@ -25,8 +25,6 @@ aux_source_directory(src/jni SRC_JNI_LIST) include_directories(include src) add_executable(lspd ${SRC_LIST} ${SRC_JNI_LIST}) -set(ENV{CCACHE_COMPILERCHECK} "content") - SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--dynamic-list=${CMAKE_SOURCE_DIR}/dynamic_list") find_package(riru REQUIRED CONFIG)