mirror of
https://github.com/nextcloud/android.git
synced 2024-12-19 15:33:00 +03:00
Merge remote-tracking branch 'origin/master' into dev
This commit is contained in:
commit
a7be2df1f3
4 changed files with 6 additions and 4 deletions
4
.github/workflows/codeql.yml
vendored
4
.github/workflows/codeql.yml
vendored
|
@ -32,7 +32,7 @@ jobs:
|
|||
with:
|
||||
swap-size-gb: 10
|
||||
- name: Initialize CodeQL
|
||||
uses: github/codeql-action/init@379614612a29c9e28f31f39a59013eb8012a51f0 # v3.24.3
|
||||
uses: github/codeql-action/init@e2e140ad1441662206e8f97754b166877dfa1c73 # v3.24.4
|
||||
with:
|
||||
languages: ${{ matrix.language }}
|
||||
- name: Set up JDK 17
|
||||
|
@ -46,4 +46,4 @@ jobs:
|
|||
echo "org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" > "$HOME/.gradle/gradle.properties"
|
||||
./gradlew assembleDebug
|
||||
- name: Perform CodeQL Analysis
|
||||
uses: github/codeql-action/analyze@379614612a29c9e28f31f39a59013eb8012a51f0 # v3.24.3
|
||||
uses: github/codeql-action/analyze@e2e140ad1441662206e8f97754b166877dfa1c73 # v3.24.4
|
||||
|
|
2
.github/workflows/scorecard.yml
vendored
2
.github/workflows/scorecard.yml
vendored
|
@ -37,6 +37,6 @@ jobs:
|
|||
|
||||
# Upload the results to GitHub's code scanning dashboard.
|
||||
- name: "Upload to code-scanning"
|
||||
uses: github/codeql-action/upload-sarif@379614612a29c9e28f31f39a59013eb8012a51f0 # v3.24.3
|
||||
uses: github/codeql-action/upload-sarif@e2e140ad1441662206e8f97754b166877dfa1c73 # v3.24.4
|
||||
with:
|
||||
sarif_file: results.sarif
|
||||
|
|
|
@ -652,6 +652,7 @@
|
|||
<string name="wait_a_moment">Aguarda un momento…</string>
|
||||
<string name="wait_checking_credentials">Verificando credenciales almacenadas</string>
|
||||
<string name="wait_for_tmp_copy_from_private_storage">Copiando el archivo desde almacenamiento privado</string>
|
||||
<string name="webview_version_check_alert_dialog_positive_button_title">Actualizar</string>
|
||||
<string name="what_s_new_image">Imagen de qué es nuevo</string>
|
||||
<string name="whats_new_skip">Omitir</string>
|
||||
<string name="whats_new_title">Nuevo en %1$s</string>
|
||||
|
|
|
@ -2,7 +2,8 @@
|
|||
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
|
||||
"extends": [
|
||||
"config:recommended",
|
||||
":switchToGradleLite"
|
||||
":switchToGradleLite",
|
||||
":gitSignOff"
|
||||
],
|
||||
"timezone": "Europe/Berlin",
|
||||
"labels": [
|
||||
|
|
Loading…
Reference in a new issue