Skip to content

Commit 7a10d28

Browse files
πŸ”„ synced local '.github/workflows/' with remote 'config/workflows/'
Signed-off-by: nextcloud-android-bot <android@nextcloud.com>
1 parent 1df79b6 commit 7a10d28

File tree

7 files changed

+10
-12
lines changed

7 files changed

+10
-12
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 OR GPL-2.0-only
2+
SPDX-License-Identifier: AGPL-3.0-or-later

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ concurrency:
2727
jobs:
2828
analysis:
2929
runs-on: ubuntu-latest
30-
timeout-minutes: 60
3130
steps:
3231
- name: Disabled on forks
3332
if: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository }}
@@ -71,9 +70,8 @@ jobs:
7170
run: |
7271
mkdir -p "$HOME/.gradle"
7372
{
74-
echo "org.gradle.jvmargs=-Xmx5g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g"
73+
echo "org.gradle.jvmargs=-Xmx1g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8"
7574
echo "org.gradle.configureondemand=true"
76-
echo "org.gradle.configuration-cache=false"
7775
echo "kapt.incremental.apt=true"
7876
} > "$HOME/.gradle/gradle.properties"
7977
scripts/analysis/analysis-wrapper.sh "${{ steps.get-vars.outputs.branch }}" "${{ secrets.LOG_USERNAME }}" "${{ secrets.LOG_PASSWORD }}" "$GITHUB_RUN_NUMBER" "${{ steps.get-vars.outputs.pr }}"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
- name: Assemble
5555
run: |
5656
mkdir -p "$HOME/.gradle"
57-
echo "org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" > "$HOME/.gradle/gradle.properties"
58-
./gradlew assembleDebug
57+
echo "org.gradle.jvmargs=-Xmx3g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" > "$HOME/.gradle/gradle.properties"
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
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 OR GPL-2.0-only
2+
SPDX-License-Identifier: AGPL-3.0-or-later

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ jobs:
4646
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4747
run: |
4848
mkdir -p "$HOME/.gradle"
49-
echo "org.gradle.jvmargs=-Xmx6g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g" > "$HOME/.gradle/gradle.properties"
49+
echo "org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g" > "$HOME/.gradle/gradle.properties"
5050
echo "org.gradle.caching=true; org.gradle.parallel=true; org.gradle.configureondemand=true; kapt.incremental.apt=true" >> "$HOME/.gradle/gradle.properties"
51-
sed -i "/qa/,/\}/ s/versionCode.*/versionCode = ${{ github.event.number }}/" app/build.gradle.kts
52-
sed -i "/qa/,/\}/ s/versionName.*/versionName = \"${{ github.event.number }}\"/" app/build.gradle.kts
51+
sed -i "/qa/,/\}/ s/versionCode .*/versionCode ${{github.event.number}} /" "app/build.gradle"
52+
sed -i "/qa/,/\}/ s/versionName .*/versionName \"${{github.event.number}}\"/" "app/build.gradle"
5353
./gradlew assembleQaDebug
5454
$(find /usr/local/lib/android/sdk/build-tools/*/apksigner | sort | tail -n1) sign --ks-pass pass:"$KS_PASS" --key-pass pass:"$KEY_PASS" --ks-key-alias key0 --ks ".github/workflows/QA_keystore.jks" app/build/outputs/apk/qa/debug/*qa-debug*.apk
5555
.github/workflows/uploadArtifact.sh "$LOG_USERNAME" "$LOG_PASSWORD" "${{github.event.number}}" "${{github.event.number}}" "$GITHUB_TOKEN"

β€Ž.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 <tobias@kaminsky.me>
6-
# SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
6+
# SPDX-License-Identifier: AGPL-3.0-or-later
77
#
88

99
#1: LOG_USERNAME

0 commit comments

Comments
Β (0)