From 6f0ff1115ddc7028ddad101ac6396310b3291534 Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Sun, 1 Sep 2024 02:56:21 +0000 Subject: [PATCH 1/6] Fix(l10n): Update translations from Transifex Signed-off-by: Nextcloud bot --- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values-gl/strings.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 2cbf892722..d57f8cc054 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -409,7 +409,7 @@ Aktualisiere Index… Verwende bestehenden Warte auf die Fertigstellung aller Synchronisierungen … - Der aktuelle Ordnername ist ungültig. Bitte benennen Sie den Ordner um. Weiterleitung zum Stammverzeichnis + Der aktuelle Ordnername ist unzulässig. Bitte benennen Sie den Ordner um. Weiterleitung zum Stammverzeichnis Der Ordnerpfad enthält reservierte Namen oder ungültige Zeichen Der Name endet mit einem Leerzeichen oder einem Punkt .%s ist eine unzulässige Dateierweiterung diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index d9b0692278..9f4861d733 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -193,7 +193,7 @@ A importación está programada e comezará en breve Non se atopou ningún ficheiro Non foi posíbel atopar a súa última copia de seguranza! - Copiado no portapapeis. + Copiado no portapapeis Produciuse un erro ao tentar copiar este ficheiro ou cartafol. Non é posíbel copiar un cartafol nun dos seus propios subcartafoles Este ficheiro xa existe no cartafol de destino From 28484420c46b661a51636bdfb296bd5f4122d2f6 Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Mon, 2 Sep 2024 02:51:14 +0000 Subject: [PATCH 2/6] Fix(l10n): Update translations from Transifex Signed-off-by: Nextcloud bot --- app/src/main/res/values-uk/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 00fc6d0db1..6669fe9a8e 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -480,6 +480,7 @@ в каталозі %1$s Також завантажити існуючі файли Завантаження тільки під час заряджання + Внутрішня двостороння синхронізація Поки не впроваджено Неправильний URL Приховано From 00075861f41594b4e828bf176b2aefc3b41f2a3f Mon Sep 17 00:00:00 2001 From: nextcloud-android-bot Date: Mon, 2 Sep 2024 08:10:12 +0000 Subject: [PATCH 3/6] =?UTF-8?q?=F0=9F=94=84=20synced=20local=20'.github/wo?= =?UTF-8?q?rkflows/'=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/renovate-approve-merge.yml | 58 ++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 .github/workflows/renovate-approve-merge.yml diff --git a/.github/workflows/renovate-approve-merge.yml b/.github/workflows/renovate-approve-merge.yml new file mode 100644 index 0000000000..48b98e91ac --- /dev/null +++ b/.github/workflows/renovate-approve-merge.yml @@ -0,0 +1,58 @@ +# This workflow is provided via the organization template repository +# +# https://github.com/nextcloud/.github +# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization +# +# SPDX-FileCopyrightText: Nextcloud GmbH and Nextcloud contributors +# SPDX-License-Identifier: MIT + +name: Auto approve renovate PRs + +on: + pull_request_target: + branches: + - main + - master + - stable* + +permissions: + contents: read + +concurrency: + group: renovate-approve-merge-${{ github.head_ref || github.run_id }} + cancel-in-progress: true + +jobs: + auto-approve-merge: + if: github.actor == 'renovate[bot]' + runs-on: ubuntu-latest + permissions: + # for hmarr/auto-approve-action to approve PRs + pull-requests: write + # for alexwilson/enable-github-automerge-action to approve PRs + contents: write + + steps: + - name: Disabled on forks + if: ${{ github.event.pull_request.head.repo.full_name != github.repository }} + run: | + echo 'Can not approve PRs from forks' + exit 1 + + - uses: mdecoleman/pr-branch-name@55795d86b4566d300d237883103f052125cc7508 # v3.0.0 + id: branchname + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + + # GitHub actions bot approve + - uses: hmarr/auto-approve-action@f0939ea97e9205ef24d872e76833fa908a770363 # v4.0.0 + if: startsWith(steps.branchname.outputs.branch, 'renovate/') + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + + # Enable GitHub auto merge + - name: Auto merge + uses: alexwilson/enable-github-automerge-action@main + if: startsWith(steps.branchname.outputs.branch, 'renovate/') + with: + github-token: ${{ secrets.GITHUB_TOKEN }} From 11e47c1861d54f067912d6797888e4d800d00128 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Mon, 2 Sep 2024 10:32:13 +0200 Subject: [PATCH 4/6] chore: housekeeping remove legacy auto approvals Signed-off-by: Andy Scherzinger --- .github/workflows/autoApproveDependabot.yml | 35 --------------- .github/workflows/autoApproveRenovate.yml | 49 --------------------- 2 files changed, 84 deletions(-) delete mode 100644 .github/workflows/autoApproveDependabot.yml delete mode 100644 .github/workflows/autoApproveRenovate.yml diff --git a/.github/workflows/autoApproveDependabot.yml b/.github/workflows/autoApproveDependabot.yml deleted file mode 100644 index eda6392b5a..0000000000 --- a/.github/workflows/autoApproveDependabot.yml +++ /dev/null @@ -1,35 +0,0 @@ -# synced from @nextcloud/android-config - -# SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors -# SPDX-FileCopyrightText: 2023 Álvaro Brey -# SPDX-License-Identifier: GPL-3.0-or-later - -name: Auto approve dependabot - -on: - pull_request_target: - branches: - - main - - master - - stable-* - -permissions: - contents: read - -concurrency: - group: dependabot-approve-${{ github.head_ref || github.run_id }} - cancel-in-progress: true - -jobs: - auto-approve: - name: Auto approve dependabot - runs-on: ubuntu-latest - if: github.actor == 'dependabot[bot]' - permissions: - # needed to approve the PR - pull-requests: write - - steps: - - uses: hmarr/auto-approve-action@f0939ea97e9205ef24d872e76833fa908a770363 # v4.0.0 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/autoApproveRenovate.yml b/.github/workflows/autoApproveRenovate.yml deleted file mode 100644 index f5e3f0cea2..0000000000 --- a/.github/workflows/autoApproveRenovate.yml +++ /dev/null @@ -1,49 +0,0 @@ -# SPDX-FileCopyrightText: 2023-2024 Nextcloud GmbH and Nextcloud contributors -# SPDX-FileCopyrightText: 2023 Álvaro Brey -# SPDX-FileCopyrightText: 2023 Andy Scherzinger -# SPDX-License-Identifier: GPL-3.0-or-later - -name: Auto approve renovate PRs - -on: - pull_request_target: - branches: - - main - - master - - stable* - -permissions: - contents: read - -concurrency: - group: renovate-approve-merge-${{ github.head_ref || github.run_id }} - cancel-in-progress: true - -jobs: - auto-approve-merge: - if: github.actor == 'renovate[bot]' - runs-on: ubuntu-latest - permissions: - # for hmarr/auto-approve-action to approve PRs - pull-requests: write - # for alexwilson/enable-github-automerge-action to approve PRs - contents: write - - steps: - - uses: mdecoleman/pr-branch-name@55795d86b4566d300d237883103f052125cc7508 # v3.0.0 - id: branchname - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - - # GitHub actions bot approve - - uses: hmarr/auto-approve-action@f0939ea97e9205ef24d872e76833fa908a770363 # v4.0.0 - if: startsWith(steps.branchname.outputs.branch, 'renovate/') - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - - # Enable GitHub auto merge - - name: Auto merge - uses: alexwilson/enable-github-automerge-action@main - if: startsWith(steps.branchname.outputs.branch, 'renovate/') - with: - github-token: ${{ secrets.GITHUB_TOKEN }} From 8fb304a6b147fd3f72b208ccfb68c2e1b8ce8406 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 17:03:43 +0000 Subject: [PATCH 5/6] fix(deps): update dependency com.github.spotbugs.snom:spotbugs-gradle-plugin to v6.0.21 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- app/build.gradle | 2 +- gradle/verification-metadata.xml | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index b87a8265e8..738735b8eb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,7 +16,7 @@ import org.gradle.internal.jvm.Jvm buildscript { dependencies { classpath "com.android.tools.build:gradle:$androidPluginVersion" - classpath 'com.github.spotbugs.snom:spotbugs-gradle-plugin:6.0.20' + classpath 'com.github.spotbugs.snom:spotbugs-gradle-plugin:6.0.21' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.6" classpath "commons-httpclient:commons-httpclient:3.1@jar" // remove after entire switch to lib v2 diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 63a157d6e9..3bc72442c2 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -10216,6 +10216,11 @@ + + + + + @@ -10297,6 +10302,11 @@ + + + + + From 4e38ef0cc3bd4bcd6694cdc2d3f1a7d4b9f94634 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 17:03:51 +0000 Subject: [PATCH 6/6] chore(deps): update actions/upload-artifact action to v4.4.0 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/screenShotTest.yml | 2 +- .github/workflows/unit-tests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/screenShotTest.yml b/.github/workflows/screenShotTest.yml index 36d74c6782..e5126b66d1 100644 --- a/.github/workflows/screenShotTest.yml +++ b/.github/workflows/screenShotTest.yml @@ -99,7 +99,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: scripts/uploadReport.sh "${{ secrets.LOG_USERNAME }}" "${{ secrets.LOG_PASSWORD }}" ${{github.event.number}} "${{ matrix.color }}-${{ matrix.scheme }}" "Screenshot" ${{github.event.number}} - name: Archive Espresso results - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6 + uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0 if: ${{ always() }} with: name: Report-${{ matrix.color }}-${{ matrix.scheme }} diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index a6fc95f1cd..866fd22603 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -49,7 +49,7 @@ jobs: fail_ci_if_error: true - name: Upload jacoco artifacts if: ${{ failure() }} - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6 + uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0 with: name: test-results path: app/build/reports/tests/testGplayDebugUnitTest/