Skip to content

Commit 8f28f91

Browse files
🔄 synced local '.github/workflows/' with remote 'config/workflows/'
Signed-off-by: nextcloud-android-bot <android@nextcloud.com>
1 parent c6439f8 commit 8f28f91

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

.github/workflows/analysis.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,10 @@ jobs:
6767
- name: Run analysis wrapper
6868
env:
6969
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
70-
71-
# Memory that is set in jvmargs must be wisely chosen.
72-
# E.g. with -Xmx5g and -Xmx1g android talk builds always failed with "The operation was canceled". -Xmx3g seems to work so far.
7370
run: |
7471
mkdir -p "$HOME/.gradle"
7572
{
76-
echo "org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g"
73+
echo "org.gradle.jvmargs=-Xmx1g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8"
7774
echo "org.gradle.configureondemand=true"
7875
echo "kapt.incremental.apt=true"
7976
} > "$HOME/.gradle/gradle.properties"

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,6 @@ jobs:
5555
run: |
5656
mkdir -p "$HOME/.gradle"
5757
echo "org.gradle.jvmargs=-Xmx3g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" > "$HOME/.gradle/gradle.properties"
58-
./gradlew assembleDebug
58+
./gradlew --no-daemon assembleDebug
5959
- name: Perform CodeQL Analysis
6060
uses: github/codeql-action/analyze@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7

.github/workflows/lib.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors
44
# SPDX-FileCopyrightText: 2022 Álvaro Brey <alvaro@alvarobrey.com>
5-
# SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
5+
# SPDX-License-Identifier: AGPL-3.0-or-later
66
#
77

88
## This file is intended to be sourced by other scripts

0 commit comments

Comments
 (0)