diff --git a/.github/workflows/build-1214.yml b/.github/workflows/build-1214.yml index f670ae81..92d1ee67 100644 --- a/.github/workflows/build-1214.yml +++ b/.github/workflows/build-1214.yml @@ -11,7 +11,6 @@ jobs: BUILD_NUMBER: ${{ github.run_number }} GRAALVM_ARGS: "-Dgraal.CompilerConfiguration=enterprise -Dgraal.UsePriorityInlining=true -Dgraal.Vectorization=true -Dgraal.OptDuplication=true -Dgraal.LoopUnroll=true -Dgraal.SpeculativeGuardMovement=true --add-modules jdk.incubator.vector" GRADLE_MEMORY: "-Xmx4g -XX:MaxMetaspaceSize=2g" - PATCH_PARALLELISM: "16" outputs: build_number: ${{ env.BUILD_NUMBER }} steps: @@ -28,6 +27,7 @@ jobs: ~/.gradle/caches/jars-* ~/.gradle/caches/transforms-* ~/.gradle/wrapper + ~/.gradle/build-cache-* # Add patches cache .gradle/patchCache .gradle/patched @@ -69,20 +69,19 @@ jobs: echo "org.gradle.jvmargs=${{ env.GRADLE_MEMORY }} -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8" >> ~/.gradle/gradle.properties echo "kotlin.incremental=true" >> ~/.gradle/gradle.properties # Add patch parallelism configuration - echo "leafPatches.parallelism=${{ env.PATCH_PARALLELISM }}" >> ~/.gradle/gradle.properties - name: Apply patches run: | - # Analyze available system resources for optimal settings - echo "CPU cores: $(nproc)" - echo "Memory: $(free -h)" + PARALLELISM=$(($(nproc) * 2)) + echo "Using parallelism: $PARALLELISM" # Run patch application with optimized settings ./gradlew -Dorg.gradle.jvmargs="${{ env.GRAALVM_ARGS }} ${{ env.GRADLE_MEMORY }}" \ - -Dleaf.patcher.parallelism=${{ env.PATCH_PARALLELISM }} \ + -Dleaf.patcher.parallelism=$PARALLELISM \ applyAllPatches \ --stacktrace --no-daemon --parallel \ - --max-workers=8 + --max-workers=$PARALLELISM \ + --build-cache - name: Create MojmapPaperclipJar run: ./gradlew -Dorg.gradle.jvmargs="${{ env.GRAALVM_ARGS }} ${{ env.GRADLE_MEMORY }}" createMojmapPaperclipJar --stacktrace --no-daemon --parallel --max-workers=8