From 7ea183f4122e7dd505b755b162e93c1ca85b65c9 Mon Sep 17 00:00:00 2001 From: nextcloud-android-bot Date: Mon, 8 Dec 2025 08:33:02 +0000 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=84=20synced=20local=20'.github/workfl?= =?UTF-8?q?ows/'=20with=20remote=20'config/workflows/'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nextcloud-android-bot --- .github/workflows/analysis.yml | 5 +---- .github/workflows/codeql.yml | 2 +- .github/workflows/lib.sh | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml index 0c1f4c8e9..d38ab46ae 100644 --- a/.github/workflows/analysis.yml +++ b/.github/workflows/analysis.yml @@ -67,13 +67,10 @@ jobs: - name: Run analysis wrapper env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - # Memory that is set in jvmargs must be wisely chosen. - # E.g. with -Xmx5g and -Xmx1g android talk builds always failed with "The operation was canceled". -Xmx3g seems to work so far. run: | mkdir -p "$HOME/.gradle" { - echo "org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g" + echo "org.gradle.jvmargs=-Xmx1g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8" echo "org.gradle.configureondemand=true" echo "kapt.incremental.apt=true" } > "$HOME/.gradle/gradle.properties" diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index accb95e40..23816c902 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -55,6 +55,6 @@ jobs: run: | mkdir -p "$HOME/.gradle" echo "org.gradle.jvmargs=-Xmx3g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" > "$HOME/.gradle/gradle.properties" - ./gradlew assembleDebug + ./gradlew --no-daemon assembleDebug - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7 diff --git a/.github/workflows/lib.sh b/.github/workflows/lib.sh index 42f4b55b3..3bb8b10f7 100644 --- a/.github/workflows/lib.sh +++ b/.github/workflows/lib.sh @@ -2,7 +2,7 @@ # # SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors # SPDX-FileCopyrightText: 2022 Álvaro Brey -# SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only +# SPDX-License-Identifier: AGPL-3.0-or-later # ## This file is intended to be sourced by other scripts