Skip to content

🔄 synced file(s) with nextcloud/android-config #6758

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nextcloud-android-bot wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −9
Open

🔄 synced file(s) with nextcloud/android-config #6758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/analysis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ concurrency:

jobs:
analysis:
runs-on: ubuntu-latest
runs-on: ubuntu-latest-max
steps:
- name: Disabled on forks
if: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository }}
Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
with:
distribution: "temurin"
java-version: 21
java-version: 25

@coderabbitai coderabbitai Bot Sep 26, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎯 Functional Correctness | 🟡 Minor | ⚡ Quick win

🔎 Supported by static analysis

🏁 Script executed:

set -eu
printf '%s\n' '--- revisions ---'
git rev-parse --verify dd7e6a8db3c793a15773529dd83659d846d1455a
git rev-parse --verify a5ebeb04c457b6b549a42213db873cddd6555c5e
printf '%s\n' '--- changed paths ---'
git diff --name-status a5ebeb04c457b6b549a42213db873cddd6555c5e dd7e6a8db3c793a15773529dd83659d846d1455a
printf '%s\n' '--- analysis workflow ---'
git show dd7e6a8db3c793a15773529dd83659d846d1455a:.github/workflows/analysis.yml | nl -ba | sed -n '45,78p'
printf '%s\n' '--- qa workflow ---'
git show dd7e6a8db3c793a15773529dd83659d846d1455a:.github/workflows/qa.yml | nl -ba | sed -n '22,52p'
printf '%s\n' '--- daemon properties ---'
git show dd7e6a8db3c793a15773529dd83659d846d1455a:gradle/gradle-daemon-jvm.properties | nl -ba
printf '%s\n' '--- relevant diff ---'
git diff --unified=20 a5ebeb04c457b6b549a42213db873cddd6555c5e dd7e6a8db3c793a15773529dd83659d846d1455a -- .github/workflows/analysis.yml .github/workflows/qa.yml gradle/gradle-daemon-jvm.properties

Repository: nextcloud/talk-android

Length of output: 9704

🏁 Script executed:

set -eu
git rev-parse --verify dd7e6a8db3c793a15773529dd83659d846d1455a
git rev-parse --verify a5ebeb04c457b6b549a42213db873cddd6555c5e
git diff --name-status a5ebeb04c457b6b549a42213db873cddd6555c5e dd7e6a8db3c793a15773529dd83659d846d1455a
git show dd7e6a8db3c793a15773529dd83659d846d1455a:.github/workflows/analysis.yml | nl -ba | sed -n '45,78p'
git show dd7e6a8db3c793a15773529dd83659d846d1455a:.github/workflows/qa.yml | nl -ba | sed -n '22,52p'
git show dd7e6a8db3c793a15773529dd83659d846d1455a:gradle/gradle-daemon-jvm.properties | nl -ba
git diff --unified=20 a5ebeb04c457b6b549a42213db873cddd6555c5e dd7e6a8db3c793a15773529dd83659d846d1455a -- .github/workflows/analysis.yml .github/workflows/qa.yml gradle/gradle-daemon-jvm.properties

Repository: nextcloud/talk-android

Length of output: 9570

🏁 Script executed:

printf '%s\n' '--- changed paths ---'
git diff --name-status a5ebeb04c457b6b549a42213db873cddd6555c5e dd7e6a8db3c793a15773529dd83659d846d1455a
printf '%s\n' '--- analysis workflow ---'
git show dd7e6a8db3c793a15773529dd83659d846d1455a:.github/workflows/analysis.yml | nl -ba | sed -n '45,78p'
printf '%s\n' '--- qa workflow ---'
git show dd7e6a8db3c793a15773529dd83659d846d1455a:.github/workflows/qa.yml | nl -ba | sed -n '22,52p'
printf '%s\n' '--- daemon properties ---'
git show dd7e6a8db3c793a15773529dd83659d846d1455a:gradle/gradle-daemon-jvm.properties | nl -ba
printf '%s\n' '--- relevant diff ---'
git diff --unified=20 a5ebeb04c457b6b549a42213db873cddd6555c5e dd7e6a8db3c793a15773529dd83659d846d1455a -- .github/workflows/analysis.yml .github/workflows/qa.yml gradle/gradle-daemon-jvm.properties

Repository: nextcloud/talk-android

Length of output: 9604

🏁 Script executed:

git show dd7e6a8db3c793a15773529dd83659d846d1455a:.github/workflows/analysis.yml | sed -n '55,70p'
git show dd7e6a8db3c793a15773529dd83659d846d1455a:.github/workflows/qa.yml | sed -n '30,45p'
git show dd7e6a8db3c793a15773529dd83659d846d1455a:gradle/gradle-daemon-jvm.properties
git diff --unified=5 a5ebeb04c457b6b549a42213db873cddd6555c5e dd7e6a8db3c793a15773529dd83659d846d1455a -- .github/workflows/analysis.yml .github/workflows/qa.yml gradle/gradle-daemon-jvm.properties

Repository: nextcloud/talk-android

Length of output: 4316

Align the Gradle daemon JVM with Java 25 when these jobs must test Gradle on Java 25.

Both workflows select Java 25, but gradle/gradle-daemon-jvm.properties pins the Gradle daemon to Java 21. Gradle gives daemon JVM criteria precedence over JAVA_HOME, so the daemon remains on Java 21. If Java 25 is intended only for the Gradle client, keep the current criterion.

Suggested fix 
-toolchainVersion=21
+toolchainVersion=25
📍 Affects 2 files
  • .github/workflows/analysis.yml#L63-L63 (this comment)
  • .github/workflows/qa.yml#L38-L38

- name: Install dependencies
run: |
sudo apt install python3-defusedxml
Expand All @@ -70,7 +70,7 @@ jobs:
run: |
mkdir -p "$HOME/.gradle"
{
echo "org.gradle.jvmargs=-Xmx1g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8"
echo "org.gradle.jvmargs=-Xmx6g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8"
echo "org.gradle.configureondemand=true"
} > "$HOME/.gradle/gradle.properties"
scripts/analysis/analysis-wrapper.sh "${{ steps.get-vars.outputs.branch }}" "${{ secrets.LOG_USERNAME }}" "${{ secrets.LOG_PASSWORD }}" "$GITHUB_RUN_NUMBER" "${{ steps.get-vars.outputs.pr }}"
6 changes: 3 additions & 3 deletions .github/workflows/codeql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,18 @@ jobs:
with:
swap-size-gb: 10
- name: Initialize CodeQL
uses: github/codeql-action/init@1c5b675653bb5c22dbe9b12b556ec555138e09fd # v4.38.1
uses: github/codeql-action/init@2892aa5e19bbd11bc0cff5427e3b750a04d9e3c2 # v4.38.2
with:
languages: ${{ matrix.language }}
- name: Set up JDK 21
uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
with:
distribution: "temurin"
java-version: 21
java-version: 25
- name: Assemble
run: |
mkdir -p "$HOME/.gradle"
echo "org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" > "$HOME/.gradle/gradle.properties"
./gradlew --no-daemon assembleDebug
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@1c5b675653bb5c22dbe9b12b556ec555138e09fd # v4.38.1
uses: github/codeql-action/analyze@2892aa5e19bbd11bc0cff5427e3b750a04d9e3c2 # v4.38.2
4 changes: 2 additions & 2 deletions .github/workflows/qa.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ concurrency:

jobs:
qa:
runs-on: ubuntu-latest
runs-on: ubuntu-latest-max
steps:
- name: Check if secrets are available
run: echo "ok=${{ secrets.KS_PASS != '' }}" >> "$GITHUB_OUTPUT"
Expand All @@ -35,7 +35,7 @@ jobs:
if: ${{ steps.check-secrets.outputs.ok == 'true' }}
with:
distribution: "temurin"
java-version: 21
java-version: 25

- name: Build QA
id: build-qa
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scorecard.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,6 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@1c5b675653bb5c22dbe9b12b556ec555138e09fd # v4.38.1
uses: github/codeql-action/upload-sarif@2892aa5e19bbd11bc0cff5427e3b750a04d9e3c2 # v4.38.2
with:
sarif_file: results.sarif
Loading