diff --git a/.github/runner-files/ci-gradle.properties b/.github/runner-files/ci-gradle.properties deleted file mode 100644 index 753351b1b..000000000 --- a/.github/runner-files/ci-gradle.properties +++ /dev/null @@ -1,7 +0,0 @@ -org.gradle.daemon=false -org.gradle.jvmargs=-Xmx5120m -org.gradle.workers.max=5 -org.gradle.parallel=true - -kotlin.incremental=false -kotlin.compiler.execution.strategy=in-process diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build_pull_request.yml index 20e6a1aa6..5b0f9b8f1 100644 --- a/.github/workflows/build_pull_request.yml +++ b/.github/workflows/build_pull_request.yml @@ -30,11 +30,6 @@ jobs: java-version: 11 distribution: adopt - - name: Copy CI files - run: | - mkdir -p ~/.gradle - cp .github/runner-files/ci-gradle.properties ~/.gradle/gradle.properties - - name: Generate multisrc sources uses: gradle/gradle-command-action@v2 with: @@ -82,11 +77,6 @@ jobs: java-version: 11 distribution: adopt - - name: Copy CI files - run: | - mkdir -p ~/.gradle - cp .github/runner-files/ci-gradle.properties ~/.gradle/gradle.properties - - name: Generate sources from the multi-source library uses: gradle/gradle-command-action@v2 env: @@ -120,11 +110,6 @@ jobs: java-version: 11 distribution: adopt - - name: Copy CI files - run: | - mkdir -p ~/.gradle - cp .github/runner-files/ci-gradle.properties ~/.gradle/gradle.properties - - name: Build extensions (chunk ${{ matrix.chunk }}) uses: gradle/gradle-command-action@v2 env: diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index c09acd4af..a5fa47e2d 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -38,11 +38,6 @@ jobs: java-version: 11 distribution: adopt - - name: Copy CI files - run: | - mkdir -p ~/.gradle - cp .github/runner-files/ci-gradle.properties ~/.gradle/gradle.properties - - name: Generate multisrc sources uses: gradle/gradle-command-action@v2 with: @@ -90,10 +85,8 @@ jobs: java-version: 11 distribution: adopt - - name: Copy CI files + - name: Prepare signing key run: | - mkdir -p ~/.gradle - cp .github/runner-files/ci-gradle.properties ~/.gradle/gradle.properties echo ${{ secrets.SIGNING_KEY }} | base64 -d > signingkey.jks - name: Generate sources from the multi-source library @@ -141,10 +134,8 @@ jobs: java-version: 11 distribution: adopt - - name: Copy CI files + - name: Prepare signing key run: | - mkdir -p ~/.gradle - cp .github/runner-files/ci-gradle.properties ~/.gradle/gradle.properties echo ${{ secrets.SIGNING_KEY }} | base64 -d > signingkey.jks - name: Build extensions (chunk ${{ matrix.chunk }}) diff --git a/gradle.properties b/gradle.properties index ae3b5127c..08688f6bd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,12 +9,13 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx3072m +org.gradle.jvmargs=-Xmx5120m # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects org.gradle.parallel=true +org.gradle.workers.max=5 org.gradle.caching=true