Skip to content

Commit 234cda3

Browse files
πŸ”„ synced local '.github/workflows/' with remote 'config/workflows/'
Signed-off-by: nextcloud-android-bot <[email protected]>
1 parent 188254c commit 234cda3

File tree

6 files changed

+8
-11
lines changed

6 files changed

+8
-11
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
SPDX-FileCopyrightText: 2019-2024 Nextcloud GmbH and Nextcloud contributors
2-
SPDX-License-Identifier: AGPL-3.0-or-later
2+
SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only

β€Ž.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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
with:
4444
swap-size-gb: 10
4545
- name: Initialize CodeQL
46-
uses: github/codeql-action/init@fe4161a26a8629af62121b670040955b330f9af2 # v4.31.6
46+
uses: github/codeql-action/init@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7
4747
with:
4848
languages: ${{ matrix.language }}
4949
- name: Set up JDK 17
@@ -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
60-
uses: github/codeql-action/analyze@fe4161a26a8629af62121b670040955b330f9af2 # v4.31.6
60+
uses: github/codeql-action/analyze@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
SPDX-FileCopyrightText: 2019-2025 Nextcloud GmbH and Nextcloud contributors
2-
SPDX-License-Identifier: AGPL-3.0-or-later
2+
SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only

β€Ž.github/workflows/scorecard.ymlβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ jobs:
4242

4343
# Upload the results to GitHub's code scanning dashboard.
4444
- name: "Upload to code-scanning"
45-
uses: github/codeql-action/upload-sarif@fe4161a26a8629af62121b670040955b330f9af2 # v4.31.6
45+
uses: github/codeql-action/upload-sarif@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7
4646
with:
4747
sarif_file: results.sarif

β€Ž.github/workflows/uploadArtifact.shβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# SPDX-FileCopyrightText: 2019-2024 Nextcloud GmbH and Nextcloud contributors
55
# SPDX-FileCopyrightText: 2019-2022 Tobias Kaminsky <[email protected]>
6-
# SPDX-License-Identifier: AGPL-3.0-or-later
6+
# SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
77
#
88

99
#1: LOG_USERNAME

0 commit comments

Comments
Β (0)