From 6979c659303a2d0d9ce530cb6ba3b285919353a4 Mon Sep 17 00:00:00 2001 From: Egor Vasilyev Date: Wed, 7 Dec 2022 13:12:11 +0300 Subject: [PATCH 01/10] some options moved from gradle.properties to GRADLE_OPTS #1470 --- .../build-and-run-tests-from-branch.yml | 16 +++++++++++++++- .github/workflows/build-and-run-tests.yml | 2 +- .github/workflows/public-rider-plugin.yml | 2 +- .github/workflows/publish-on-github-packages.yml | 2 +- .../publish-plugin-and-cli-from-branch.yml | 2 +- .../workflows/run-chosen-tests-from-branch.yml | 2 +- gradle.properties | 4 ---- 7 files changed, 20 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-and-run-tests-from-branch.yml b/.github/workflows/build-and-run-tests-from-branch.yml index ff5f7e456c..fc52826f68 100644 --- a/.github/workflows/build-and-run-tests-from-branch.yml +++ b/.github/workflows/build-and-run-tests-from-branch.yml @@ -19,7 +19,21 @@ env: IMAGE_NAME: utbot_java_cli DOCKERFILE_PATH: docker/Dockerfile_java_cli # Environment variable setting gradle options. - GRADLE_OPTS: "-XX:MaxHeapSize=2048m -Dorg.gradle.jvmargs='-XX:MaxHeapSize=2048m -XX:MaxPermSize=512m -Dorg.gradle.daemon=false' -Dorg.gradle.daemon=false" + # + # When configuring Gradle behavior you can use these methods, + # listed in order of highest to lowest precedence (first one wins): + # - Command-line flags such as --build-cache. + # These have precedence over properties and environment variables. + # - System properties such as systemProp.http.proxyHost=somehost.org + # stored in a gradle.properties file in a root project directory. + # - Gradle properties such as org.gradle.caching=true that are + # typically stored in a gradle.properties file in a project + # directory or in the GRADLE_USER_HOME. + # - Environment variables such as GRADLE_OPTS sourced by the + # environment that executes Gradle. + # + # read more at: https://docs.gradle.org/current/userguide/build_environment.html + GRADLE_OPTS: "-XX:MaxHeapSize=2048m -Dorg.gradle.daemon=false -Dorg.gradle.parallel=false -Dkotlin.compiler.execution.strategy=in-process" PUSHGATEWAY_HOSTNAME: monitoring.utbot.org ELK_HOSTNAME: logs.utbot.org FILEBEAT_DIR: /tmp/filebeat diff --git a/.github/workflows/build-and-run-tests.yml b/.github/workflows/build-and-run-tests.yml index b3c62a1559..23753f87f6 100644 --- a/.github/workflows/build-and-run-tests.yml +++ b/.github/workflows/build-and-run-tests.yml @@ -15,7 +15,7 @@ env: IMAGE_NAME: utbot_java_cli DOCKERFILE_PATH: docker/Dockerfile_java_cli # Environment variable setting gradle options. - GRADLE_OPTS: "-XX:MaxHeapSize=2048m -Dorg.gradle.jvmargs='-XX:MaxHeapSize=2048m -XX:MaxPermSize=512m -Dorg.gradle.daemon=false' -Dorg.gradle.daemon=false" + GRADLE_OPTS: "-XX:MaxHeapSize=2048m -Dorg.gradle.daemon=false -Dorg.gradle.parallel=false -Dkotlin.compiler.execution.strategy=in-process" jobs: build-and-run-tests: diff --git a/.github/workflows/public-rider-plugin.yml b/.github/workflows/public-rider-plugin.yml index fe78d8c3da..7fc35cffda 100644 --- a/.github/workflows/public-rider-plugin.yml +++ b/.github/workflows/public-rider-plugin.yml @@ -33,7 +33,7 @@ on: env: # Environment variable setting gradle options. - GRADLE_OPTS: "-XX:MaxHeapSize=2048m -Dorg.gradle.jvmargs='-XX:MaxHeapSize=2048m -XX:MaxPermSize=512m -Dorg.gradle.daemon=false' -Dorg.gradle.daemon=false" + GRADLE_OPTS: "-XX:MaxHeapSize=2048m -Dorg.gradle.daemon=false -Dorg.gradle.parallel=false -Dkotlin.compiler.execution.strategy=in-process" # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: diff --git a/.github/workflows/publish-on-github-packages.yml b/.github/workflows/publish-on-github-packages.yml index 69fd73e0bc..fd7ce6b22a 100644 --- a/.github/workflows/publish-on-github-packages.yml +++ b/.github/workflows/publish-on-github-packages.yml @@ -10,7 +10,7 @@ on: env: # Environment variable setting gradle options. - GRADLE_OPTS: "-XX:MaxHeapSize=2048m -Dorg.gradle.jvmargs='-XX:MaxHeapSize=2048m -XX:MaxPermSize=512m -Dorg.gradle.daemon=false' -Dorg.gradle.daemon=false" + GRADLE_OPTS: "-XX:MaxHeapSize=2048m -Dorg.gradle.daemon=false -Dorg.gradle.parallel=false -Dkotlin.compiler.execution.strategy=in-process" jobs: build-and-run-tests: diff --git a/.github/workflows/publish-plugin-and-cli-from-branch.yml b/.github/workflows/publish-plugin-and-cli-from-branch.yml index 53bac40c73..32d4b154b9 100644 --- a/.github/workflows/publish-plugin-and-cli-from-branch.yml +++ b/.github/workflows/publish-plugin-and-cli-from-branch.yml @@ -42,7 +42,7 @@ on: env: # Environment variable setting gradle options. - GRADLE_OPTS: "-XX:MaxHeapSize=2048m -Dorg.gradle.jvmargs='-XX:MaxHeapSize=2048m -XX:MaxPermSize=512m -Dorg.gradle.daemon=false' -Dorg.gradle.daemon=false" + GRADLE_OPTS: "-XX:MaxHeapSize=2048m -Dorg.gradle.daemon=false -Dorg.gradle.parallel=false -Dkotlin.compiler.execution.strategy=in-process" jobs: publish_plugin_and_cli: diff --git a/.github/workflows/run-chosen-tests-from-branch.yml b/.github/workflows/run-chosen-tests-from-branch.yml index 786c55eeb7..1e6ba3aa4f 100644 --- a/.github/workflows/run-chosen-tests-from-branch.yml +++ b/.github/workflows/run-chosen-tests-from-branch.yml @@ -29,7 +29,7 @@ on: env: # Environment variable setting gradle options. - GRADLE_OPTS: "-XX:MaxHeapSize=2048m -Dorg.gradle.jvmargs='-XX:MaxHeapSize=2048m -XX:MaxPermSize=512m -Dorg.gradle.daemon=false' -Dorg.gradle.daemon=false" + GRADLE_OPTS: "-XX:MaxHeapSize=2048m -Dorg.gradle.daemon=false -Dorg.gradle.parallel=false -Dkotlin.compiler.execution.strategy=in-process" PUSHGATEWAY_HOSTNAME: monitoring.utbot.org jobs: diff --git a/gradle.properties b/gradle.properties index af70eca1b1..ba579eb566 100644 --- a/gradle.properties +++ b/gradle.properties @@ -75,11 +75,7 @@ openblasVersion=0.3.10-1.5.4 arpackNgVersion=3.7.0-1.5.4 # configuration for build server -org.gradle.daemon=false -org.gradle.parallel=false org.gradle.jvmargs="-XX:MaxHeapSize=6144m" -kotlin.compiler.execution.strategy=in-process -org.gradle.caching=false # configuration for local compilation - much faster #org.gradle.daemon=true From bdc7538f1f479ce91ed91091ca4b76fe8d240649 Mon Sep 17 00:00:00 2001 From: Egor Vasilyev Date: Thu, 8 Dec 2022 13:14:59 +0300 Subject: [PATCH 02/10] comments added --- gradle.properties | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index ba579eb566..59b22c215f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -75,6 +75,12 @@ openblasVersion=0.3.10-1.5.4 arpackNgVersion=3.7.0-1.5.4 # configuration for build server +# +# the following options are passed to gradle command explicitly (see appropriate workflow): +# --build-cache (the same as org.gradle.caching=true) +# --no-daemon (the same as org.gradle.daemon=false) +# +# read about options precedence at: https://docs.gradle.org/current/userguide/build_environment.html org.gradle.jvmargs="-XX:MaxHeapSize=6144m" # configuration for local compilation - much faster @@ -83,4 +89,3 @@ org.gradle.jvmargs="-XX:MaxHeapSize=6144m" #org.gradle.parallel=true #org.gradle.caching=true #org.gradle.workers.max=8 -#org.gradle.jvmargs="-XX:MaxHeapSize=6144m" \ No newline at end of file From e5cfa9e344e71a4530a62c6c6fb1e50c1c19286c Mon Sep 17 00:00:00 2001 From: Egor Vasilyev Date: Mon, 26 Dec 2022 13:47:15 +0300 Subject: [PATCH 03/10] redundant gradle_opts removed --- .../workflows/build-and-run-tests-from-branch.yml | 10 +++++----- .github/workflows/build-and-run-tests.yml | 4 ++-- .github/workflows/public-rider-plugin.yml | 4 ++-- .github/workflows/publish-on-github-packages.yml | 2 +- .../workflows/publish-plugin-and-cli-from-branch.yml | 6 +++--- .github/workflows/run-chosen-tests-from-branch.yml | 4 ++-- gradle.properties | 12 ++++++------ 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build-and-run-tests-from-branch.yml b/.github/workflows/build-and-run-tests-from-branch.yml index fc52826f68..01a52e15bd 100644 --- a/.github/workflows/build-and-run-tests-from-branch.yml +++ b/.github/workflows/build-and-run-tests-from-branch.yml @@ -33,7 +33,7 @@ env: # environment that executes Gradle. # # read more at: https://docs.gradle.org/current/userguide/build_environment.html - GRADLE_OPTS: "-XX:MaxHeapSize=2048m -Dorg.gradle.daemon=false -Dorg.gradle.parallel=false -Dkotlin.compiler.execution.strategy=in-process" +# GRADLE_OPTS: "-XX:MaxHeapSize=2048m -Dorg.gradle.daemon=false -Dorg.gradle.parallel=false -Dkotlin.compiler.execution.strategy=in-process" PUSHGATEWAY_HOSTNAME: monitoring.utbot.org ELK_HOSTNAME: logs.utbot.org FILEBEAT_DIR: /tmp/filebeat @@ -129,7 +129,7 @@ jobs: restore-keys: ${{ runner.os }}-gradle-framework - name: Run tests run: | - gradle --build-cache --no-daemon :utbot-framework-test:test ${{ matrix.project.TESTS_TO_RUN }} + gradle --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx2g -Dkotlin.daemon.jvm.options=-Xmx4g :utbot-framework-test:test ${{ matrix.project.TESTS_TO_RUN }} - name: Upload logs if: ${{ always() }} @@ -205,13 +205,13 @@ jobs: id: first-project run: | cd ${{ matrix.projects.first }} - gradle build --build-cache --no-daemon + gradle build --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx2g -Dkotlin.daemon.jvm.options=-Xmx4g - name: Build project ${{ matrix.projects.second }} if: ${{ steps.first-project.outcome != 'cancelled' && steps.first-project.outcome != 'skipped' }} run: | cd ${{ matrix.projects.second }} - gradle build --build-cache --no-daemon + gradle build --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx2g -Dkotlin.daemon.jvm.options=-Xmx4g - name: Upload test report if tests have failed if: ${{ failure() }} @@ -280,7 +280,7 @@ jobs: - name: Run tests run: | cd ${{ matrix.project }} - gradle build --build-cache --no-daemon + gradle build --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx2g -Dkotlin.daemon.jvm.options=-Xmx4g - name: Upload test report if tests have failed if: ${{ failure() }} diff --git a/.github/workflows/build-and-run-tests.yml b/.github/workflows/build-and-run-tests.yml index 23753f87f6..36094cb778 100644 --- a/.github/workflows/build-and-run-tests.yml +++ b/.github/workflows/build-and-run-tests.yml @@ -15,7 +15,7 @@ env: IMAGE_NAME: utbot_java_cli DOCKERFILE_PATH: docker/Dockerfile_java_cli # Environment variable setting gradle options. - GRADLE_OPTS: "-XX:MaxHeapSize=2048m -Dorg.gradle.daemon=false -Dorg.gradle.parallel=false -Dkotlin.compiler.execution.strategy=in-process" +# GRADLE_OPTS: "-XX:MaxHeapSize=2048m -Dorg.gradle.daemon=false -Dorg.gradle.parallel=false -Dkotlin.compiler.execution.strategy=in-process" jobs: build-and-run-tests: @@ -43,7 +43,7 @@ jobs: - name: Build UTBot Java CLI run: | cd utbot-cli - gradle build --no-daemon -x test -PsemVer=${{ env.VERSION }} + gradle build --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx2g -Dkotlin.daemon.jvm.options=-Xmx4g -x test -PsemVer=${{ env.VERSION }} - name: Set docker tag run: # "You can make an environment variable available to any subsequent steps in a workflow job by diff --git a/.github/workflows/public-rider-plugin.yml b/.github/workflows/public-rider-plugin.yml index 7fc35cffda..d7d994fbe6 100644 --- a/.github/workflows/public-rider-plugin.yml +++ b/.github/workflows/public-rider-plugin.yml @@ -33,7 +33,7 @@ on: env: # Environment variable setting gradle options. - GRADLE_OPTS: "-XX:MaxHeapSize=2048m -Dorg.gradle.daemon=false -Dorg.gradle.parallel=false -Dkotlin.compiler.execution.strategy=in-process" +# GRADLE_OPTS: "-XX:MaxHeapSize=2048m -Dorg.gradle.daemon=false -Dorg.gradle.parallel=false -Dkotlin.compiler.execution.strategy=in-process" # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: @@ -75,7 +75,7 @@ jobs: - name: Build UTBot Rider plugin run: | - gradle clean :utbot-rider:buildPlugin --no-daemon -PsemVer=${{ env.VERSION }} -PincludeRiderInBuild=true + gradle clean :utbot-rider:buildPlugin --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx2g -Dkotlin.daemon.jvm.options=-Xmx4g -PsemVer=${{ env.VERSION }} -PincludeRiderInBuild=true cd utbot-rider/build/distributions unzip utbot-rider-${{ env.VERSION }}.zip rm utbot-rider-${{ env.VERSION }}.zip diff --git a/.github/workflows/publish-on-github-packages.yml b/.github/workflows/publish-on-github-packages.yml index fd7ce6b22a..9c1a802e12 100644 --- a/.github/workflows/publish-on-github-packages.yml +++ b/.github/workflows/publish-on-github-packages.yml @@ -10,7 +10,7 @@ on: env: # Environment variable setting gradle options. - GRADLE_OPTS: "-XX:MaxHeapSize=2048m -Dorg.gradle.daemon=false -Dorg.gradle.parallel=false -Dkotlin.compiler.execution.strategy=in-process" +# GRADLE_OPTS: "-XX:MaxHeapSize=2048m -Dorg.gradle.daemon=false -Dorg.gradle.parallel=false -Dkotlin.compiler.execution.strategy=in-process" jobs: build-and-run-tests: diff --git a/.github/workflows/publish-plugin-and-cli-from-branch.yml b/.github/workflows/publish-plugin-and-cli-from-branch.yml index 32d4b154b9..8df9f925ad 100644 --- a/.github/workflows/publish-plugin-and-cli-from-branch.yml +++ b/.github/workflows/publish-plugin-and-cli-from-branch.yml @@ -42,7 +42,7 @@ on: env: # Environment variable setting gradle options. - GRADLE_OPTS: "-XX:MaxHeapSize=2048m -Dorg.gradle.daemon=false -Dorg.gradle.parallel=false -Dkotlin.compiler.execution.strategy=in-process" +# GRADLE_OPTS: "-XX:MaxHeapSize=2048m -Dorg.gradle.daemon=false -Dorg.gradle.parallel=false -Dkotlin.compiler.execution.strategy=in-process" jobs: publish_plugin_and_cli: @@ -79,7 +79,7 @@ jobs: - name: Build UTBot IntelliJ IDEA plugin run: | - gradle clean buildPlugin --no-daemon -PsemVer=${{ env.VERSION }} + gradle clean buildPlugin --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx2g -Dkotlin.daemon.jvm.options=-Xmx4g -PsemVer=${{ env.VERSION }} cd utbot-intellij/build/distributions unzip utbot-intellij-${{ env.VERSION }}.zip rm utbot-intellij-${{ env.VERSION }}.zip @@ -93,7 +93,7 @@ jobs: - name: Build UTBot CLI run: | cd utbot-cli - gradle clean build --no-daemon -PsemVer=${{ env.VERSION }} + gradle clean build --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx2g -Dkotlin.daemon.jvm.options=-Xmx4g -PsemVer=${{ env.VERSION }} - name: Archive UTBot CLI uses: actions/upload-artifact@v3 diff --git a/.github/workflows/run-chosen-tests-from-branch.yml b/.github/workflows/run-chosen-tests-from-branch.yml index 1e6ba3aa4f..d79e56fb95 100644 --- a/.github/workflows/run-chosen-tests-from-branch.yml +++ b/.github/workflows/run-chosen-tests-from-branch.yml @@ -29,7 +29,7 @@ on: env: # Environment variable setting gradle options. - GRADLE_OPTS: "-XX:MaxHeapSize=2048m -Dorg.gradle.daemon=false -Dorg.gradle.parallel=false -Dkotlin.compiler.execution.strategy=in-process" +# GRADLE_OPTS: "-XX:MaxHeapSize=2048m -Dorg.gradle.daemon=false -Dorg.gradle.parallel=false -Dkotlin.compiler.execution.strategy=in-process" PUSHGATEWAY_HOSTNAME: monitoring.utbot.org jobs: @@ -51,7 +51,7 @@ jobs: - name: Run chosen tests run: | - gradle :${{ github.event.inputs.project-name }}:test --no-daemon --tests ${{ github.event.inputs.tests-bunch-name }} + gradle :${{ github.event.inputs.project-name }}:test --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx2g -Dkotlin.daemon.jvm.options=-Xmx4g --tests ${{ github.event.inputs.tests-bunch-name }} - name: Upload ${{ github.event.inputs.project-name }} tests report if tests have failed if: ${{ failure() }} diff --git a/gradle.properties b/gradle.properties index 72a9e4c332..2c7b907df7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -81,11 +81,11 @@ arpackNgVersion=3.7.0-1.5.4 # --no-daemon (the same as org.gradle.daemon=false) # # read about options precedence at: https://docs.gradle.org/current/userguide/build_environment.html -org.gradle.jvmargs="-XX:MaxHeapSize=6144m" +org.gradle.jvmargs="-Xmx6g" # configuration for local compilation - much faster -#org.gradle.daemon=true -#kotlin.daemon.jvm.options=-Xmx4g -#org.gradle.parallel=true -#org.gradle.caching=true -#org.gradle.workers.max=8 +org.gradle.daemon=true +kotlin.daemon.jvm.options=-Xmx4g +org.gradle.parallel=true +org.gradle.caching=true +org.gradle.workers.max=8 From 28d1fde9fb21d1adff18fa4f4726935d8f9f16bb Mon Sep 17 00:00:00 2001 From: Egor Vasilyev Date: Mon, 26 Dec 2022 16:03:31 +0300 Subject: [PATCH 04/10] description of each user parameters in gradle.properties --- gradle.properties | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gradle.properties b/gradle.properties index 2c7b907df7..a8c67e98d3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -84,8 +84,15 @@ arpackNgVersion=3.7.0-1.5.4 org.gradle.jvmargs="-Xmx6g" # configuration for local compilation - much faster +# overrided by some parameters in CI, read below about each option +# +# overrided by --no-daemon org.gradle.daemon=true +# overrided by -Dkotlin.daemon.jvm.options=-Xmx4g kotlin.daemon.jvm.options=-Xmx4g +# overrided by --no-parallel org.gradle.parallel=true +# not overrided, we use cache in CI as well org.gradle.caching=true +# there is no need to override the option below because parallel execution is disabled by --no-parallel org.gradle.workers.max=8 From d5c6a7c87ce3b524c013738824200dda56fef364 Mon Sep 17 00:00:00 2001 From: Egor Vasilyev Date: Mon, 26 Dec 2022 16:03:52 +0300 Subject: [PATCH 05/10] GRADLE_OPTS completely removed from workflows --- .github/workflows/build-and-run-tests-from-branch.yml | 2 ++ .github/workflows/build-and-run-tests.yml | 2 -- .github/workflows/public-rider-plugin.yml | 4 ---- .github/workflows/publish-on-github-packages.yml | 4 ---- .github/workflows/publish-plugin-and-cli-from-branch.yml | 4 ---- .github/workflows/run-chosen-tests-from-branch.yml | 2 -- 6 files changed, 2 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build-and-run-tests-from-branch.yml b/.github/workflows/build-and-run-tests-from-branch.yml index 01a52e15bd..6db7f68416 100644 --- a/.github/workflows/build-and-run-tests-from-branch.yml +++ b/.github/workflows/build-and-run-tests-from-branch.yml @@ -33,6 +33,8 @@ env: # environment that executes Gradle. # # read more at: https://docs.gradle.org/current/userguide/build_environment.html + # + # example of GRADLE_OPTS: # GRADLE_OPTS: "-XX:MaxHeapSize=2048m -Dorg.gradle.daemon=false -Dorg.gradle.parallel=false -Dkotlin.compiler.execution.strategy=in-process" PUSHGATEWAY_HOSTNAME: monitoring.utbot.org ELK_HOSTNAME: logs.utbot.org diff --git a/.github/workflows/build-and-run-tests.yml b/.github/workflows/build-and-run-tests.yml index 36094cb778..d434016a8d 100644 --- a/.github/workflows/build-and-run-tests.yml +++ b/.github/workflows/build-and-run-tests.yml @@ -14,8 +14,6 @@ env: REGISTRY: ghcr.io IMAGE_NAME: utbot_java_cli DOCKERFILE_PATH: docker/Dockerfile_java_cli - # Environment variable setting gradle options. -# GRADLE_OPTS: "-XX:MaxHeapSize=2048m -Dorg.gradle.daemon=false -Dorg.gradle.parallel=false -Dkotlin.compiler.execution.strategy=in-process" jobs: build-and-run-tests: diff --git a/.github/workflows/public-rider-plugin.yml b/.github/workflows/public-rider-plugin.yml index d7d994fbe6..f164079545 100644 --- a/.github/workflows/public-rider-plugin.yml +++ b/.github/workflows/public-rider-plugin.yml @@ -31,10 +31,6 @@ on: - alpha - beta -env: - # Environment variable setting gradle options. -# GRADLE_OPTS: "-XX:MaxHeapSize=2048m -Dorg.gradle.daemon=false -Dorg.gradle.parallel=false -Dkotlin.compiler.execution.strategy=in-process" - # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: # This workflow contains a single job called "greet" diff --git a/.github/workflows/publish-on-github-packages.yml b/.github/workflows/publish-on-github-packages.yml index 9c1a802e12..1404878c63 100644 --- a/.github/workflows/publish-on-github-packages.yml +++ b/.github/workflows/publish-on-github-packages.yml @@ -7,10 +7,6 @@ on: type: string required: true description: "commit SHA: e.g. cab4799c" - -env: - # Environment variable setting gradle options. -# GRADLE_OPTS: "-XX:MaxHeapSize=2048m -Dorg.gradle.daemon=false -Dorg.gradle.parallel=false -Dkotlin.compiler.execution.strategy=in-process" jobs: build-and-run-tests: diff --git a/.github/workflows/publish-plugin-and-cli-from-branch.yml b/.github/workflows/publish-plugin-and-cli-from-branch.yml index 8df9f925ad..7255c32a37 100644 --- a/.github/workflows/publish-plugin-and-cli-from-branch.yml +++ b/.github/workflows/publish-plugin-and-cli-from-branch.yml @@ -40,10 +40,6 @@ on: - alpha - beta -env: - # Environment variable setting gradle options. -# GRADLE_OPTS: "-XX:MaxHeapSize=2048m -Dorg.gradle.daemon=false -Dorg.gradle.parallel=false -Dkotlin.compiler.execution.strategy=in-process" - jobs: publish_plugin_and_cli: runs-on: ubuntu-20.04 diff --git a/.github/workflows/run-chosen-tests-from-branch.yml b/.github/workflows/run-chosen-tests-from-branch.yml index d79e56fb95..57d56ad867 100644 --- a/.github/workflows/run-chosen-tests-from-branch.yml +++ b/.github/workflows/run-chosen-tests-from-branch.yml @@ -28,8 +28,6 @@ on: description: "{package-name}.{class-name-optional}.{test-name-optional}" env: - # Environment variable setting gradle options. -# GRADLE_OPTS: "-XX:MaxHeapSize=2048m -Dorg.gradle.daemon=false -Dorg.gradle.parallel=false -Dkotlin.compiler.execution.strategy=in-process" PUSHGATEWAY_HOSTNAME: monitoring.utbot.org jobs: From 279cbbaac23f939a954bc85eb10e985bf4d87968 Mon Sep 17 00:00:00 2001 From: Egor Vasilyev Date: Mon, 26 Dec 2022 20:03:04 +0300 Subject: [PATCH 06/10] test wit -Xmx6g --- .../workflows/build-and-run-tests-from-branch.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-and-run-tests-from-branch.yml b/.github/workflows/build-and-run-tests-from-branch.yml index 6db7f68416..da74dda90f 100644 --- a/.github/workflows/build-and-run-tests-from-branch.yml +++ b/.github/workflows/build-and-run-tests-from-branch.yml @@ -131,7 +131,8 @@ jobs: restore-keys: ${{ runner.os }}-gradle-framework - name: Run tests run: | - gradle --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx2g -Dkotlin.daemon.jvm.options=-Xmx4g :utbot-framework-test:test ${{ matrix.project.TESTS_TO_RUN }} + gradle --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx6g -Dkotlin.daemon.jvm.options=-Xmx4g :utbot-framework-test:test ${{ matrix.project.TESTS_TO_RUN }} +#gradle --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx2g -Dkotlin.daemon.jvm.options=-Xmx4g :utbot-framework-test:test ${{ matrix.project.TESTS_TO_RUN }} - name: Upload logs if: ${{ always() }} @@ -207,14 +208,15 @@ jobs: id: first-project run: | cd ${{ matrix.projects.first }} - gradle build --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx2g -Dkotlin.daemon.jvm.options=-Xmx4g + gradle build --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx6g -Dkotlin.daemon.jvm.options=-Xmx4g +#gradle build --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx2g -Dkotlin.daemon.jvm.options=-Xmx4g - name: Build project ${{ matrix.projects.second }} if: ${{ steps.first-project.outcome != 'cancelled' && steps.first-project.outcome != 'skipped' }} run: | cd ${{ matrix.projects.second }} - gradle build --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx2g -Dkotlin.daemon.jvm.options=-Xmx4g - + gradle build --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx6g -Dkotlin.daemon.jvm.options=-Xmx4g +#gradle build --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx2g -Dkotlin.daemon.jvm.options=-Xmx4g - name: Upload test report if tests have failed if: ${{ failure() }} uses: actions/upload-artifact@v3 @@ -282,7 +284,8 @@ jobs: - name: Run tests run: | cd ${{ matrix.project }} - gradle build --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx2g -Dkotlin.daemon.jvm.options=-Xmx4g + gradle build --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx6g -Dkotlin.daemon.jvm.options=-Xmx4g +#gradle build --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx2g -Dkotlin.daemon.jvm.options=-Xmx4g - name: Upload test report if tests have failed if: ${{ failure() }} From 812fbd4f6ffe839be6406baa1f6523a4eaaffc90 Mon Sep 17 00:00:00 2001 From: Egor Vasilyev Date: Tue, 27 Dec 2022 11:58:10 +0300 Subject: [PATCH 07/10] test with -Dkotlin.daemon.jvm.options=-Xmx512m --- .github/workflows/build-and-run-tests-from-branch.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-and-run-tests-from-branch.yml b/.github/workflows/build-and-run-tests-from-branch.yml index da74dda90f..784b81b0c2 100644 --- a/.github/workflows/build-and-run-tests-from-branch.yml +++ b/.github/workflows/build-and-run-tests-from-branch.yml @@ -131,7 +131,7 @@ jobs: restore-keys: ${{ runner.os }}-gradle-framework - name: Run tests run: | - gradle --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx6g -Dkotlin.daemon.jvm.options=-Xmx4g :utbot-framework-test:test ${{ matrix.project.TESTS_TO_RUN }} + gradle --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx6g -Dkotlin.daemon.jvm.options=-Xmx512m :utbot-framework-test:test ${{ matrix.project.TESTS_TO_RUN }} #gradle --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx2g -Dkotlin.daemon.jvm.options=-Xmx4g :utbot-framework-test:test ${{ matrix.project.TESTS_TO_RUN }} - name: Upload logs @@ -208,14 +208,14 @@ jobs: id: first-project run: | cd ${{ matrix.projects.first }} - gradle build --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx6g -Dkotlin.daemon.jvm.options=-Xmx4g + gradle build --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx6g -Dkotlin.daemon.jvm.options=-Xmx512m #gradle build --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx2g -Dkotlin.daemon.jvm.options=-Xmx4g - name: Build project ${{ matrix.projects.second }} if: ${{ steps.first-project.outcome != 'cancelled' && steps.first-project.outcome != 'skipped' }} run: | cd ${{ matrix.projects.second }} - gradle build --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx6g -Dkotlin.daemon.jvm.options=-Xmx4g + gradle build --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx6g -Dkotlin.daemon.jvm.options=-Xmx512m #gradle build --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx2g -Dkotlin.daemon.jvm.options=-Xmx4g - name: Upload test report if tests have failed if: ${{ failure() }} @@ -284,7 +284,7 @@ jobs: - name: Run tests run: | cd ${{ matrix.project }} - gradle build --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx6g -Dkotlin.daemon.jvm.options=-Xmx4g + gradle build --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx6g -Dkotlin.daemon.jvm.options=-Xmx512m #gradle build --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx2g -Dkotlin.daemon.jvm.options=-Xmx4g - name: Upload test report if tests have failed From a3a0f4c749165a731f1ee3efb3ef8f2c5a67ea3a Mon Sep 17 00:00:00 2001 From: Egor Vasilyev Date: Tue, 27 Dec 2022 13:17:37 +0300 Subject: [PATCH 08/10] revert back kotlin.daemon.jvm.options --- .github/workflows/build-and-run-tests-from-branch.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-and-run-tests-from-branch.yml b/.github/workflows/build-and-run-tests-from-branch.yml index 784b81b0c2..da74dda90f 100644 --- a/.github/workflows/build-and-run-tests-from-branch.yml +++ b/.github/workflows/build-and-run-tests-from-branch.yml @@ -131,7 +131,7 @@ jobs: restore-keys: ${{ runner.os }}-gradle-framework - name: Run tests run: | - gradle --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx6g -Dkotlin.daemon.jvm.options=-Xmx512m :utbot-framework-test:test ${{ matrix.project.TESTS_TO_RUN }} + gradle --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx6g -Dkotlin.daemon.jvm.options=-Xmx4g :utbot-framework-test:test ${{ matrix.project.TESTS_TO_RUN }} #gradle --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx2g -Dkotlin.daemon.jvm.options=-Xmx4g :utbot-framework-test:test ${{ matrix.project.TESTS_TO_RUN }} - name: Upload logs @@ -208,14 +208,14 @@ jobs: id: first-project run: | cd ${{ matrix.projects.first }} - gradle build --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx6g -Dkotlin.daemon.jvm.options=-Xmx512m + gradle build --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx6g -Dkotlin.daemon.jvm.options=-Xmx4g #gradle build --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx2g -Dkotlin.daemon.jvm.options=-Xmx4g - name: Build project ${{ matrix.projects.second }} if: ${{ steps.first-project.outcome != 'cancelled' && steps.first-project.outcome != 'skipped' }} run: | cd ${{ matrix.projects.second }} - gradle build --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx6g -Dkotlin.daemon.jvm.options=-Xmx512m + gradle build --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx6g -Dkotlin.daemon.jvm.options=-Xmx4g #gradle build --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx2g -Dkotlin.daemon.jvm.options=-Xmx4g - name: Upload test report if tests have failed if: ${{ failure() }} @@ -284,7 +284,7 @@ jobs: - name: Run tests run: | cd ${{ matrix.project }} - gradle build --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx6g -Dkotlin.daemon.jvm.options=-Xmx512m + gradle build --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx6g -Dkotlin.daemon.jvm.options=-Xmx4g #gradle build --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx2g -Dkotlin.daemon.jvm.options=-Xmx4g - name: Upload test report if tests have failed From 57f15147a55aa584208574671d778ef5c9f6b52e Mon Sep 17 00:00:00 2001 From: Egor Vasilyev Date: Wed, 28 Dec 2022 10:08:41 +0300 Subject: [PATCH 09/10] remove backup comments --- .github/workflows/build-and-run-tests-from-branch.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/build-and-run-tests-from-branch.yml b/.github/workflows/build-and-run-tests-from-branch.yml index da74dda90f..021a991d4e 100644 --- a/.github/workflows/build-and-run-tests-from-branch.yml +++ b/.github/workflows/build-and-run-tests-from-branch.yml @@ -132,7 +132,6 @@ jobs: - name: Run tests run: | gradle --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx6g -Dkotlin.daemon.jvm.options=-Xmx4g :utbot-framework-test:test ${{ matrix.project.TESTS_TO_RUN }} -#gradle --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx2g -Dkotlin.daemon.jvm.options=-Xmx4g :utbot-framework-test:test ${{ matrix.project.TESTS_TO_RUN }} - name: Upload logs if: ${{ always() }} @@ -209,14 +208,13 @@ jobs: run: | cd ${{ matrix.projects.first }} gradle build --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx6g -Dkotlin.daemon.jvm.options=-Xmx4g -#gradle build --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx2g -Dkotlin.daemon.jvm.options=-Xmx4g - name: Build project ${{ matrix.projects.second }} if: ${{ steps.first-project.outcome != 'cancelled' && steps.first-project.outcome != 'skipped' }} run: | cd ${{ matrix.projects.second }} gradle build --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx6g -Dkotlin.daemon.jvm.options=-Xmx4g -#gradle build --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx2g -Dkotlin.daemon.jvm.options=-Xmx4g + - name: Upload test report if tests have failed if: ${{ failure() }} uses: actions/upload-artifact@v3 @@ -285,7 +283,6 @@ jobs: run: | cd ${{ matrix.project }} gradle build --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx6g -Dkotlin.daemon.jvm.options=-Xmx4g -#gradle build --no-daemon --build-cache --no-parallel -Dorg.gradle.jvmargs=-Xmx2g -Dkotlin.daemon.jvm.options=-Xmx4g - name: Upload test report if tests have failed if: ${{ failure() }} From 1e425dc05744bd804f54cf71c1ccbbba0713ee06 Mon Sep 17 00:00:00 2001 From: Egor Vasilyev Date: Fri, 13 Jan 2023 12:42:25 +0300 Subject: [PATCH 10/10] typo fixed --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 29b21186f8..4a172b8ed8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -84,7 +84,7 @@ arpackNgVersion=3.7.0-1.5.4 org.gradle.jvmargs="-Xmx6g" # configuration for local compilation - much faster -# overrided by some parameters in CI, read below about each option +# overriden by some parameters in CI, read below about each option # # overrided by --no-daemon org.gradle.daemon=true