mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-20 16:02:01 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into dev

Browse source
This commit is contained in:
Tobias Kaminsky 2024-02-07 03:35:13 +01:00
commit 75cdab78ab
3 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.github/workflows/qa.yml vendored
View file

@ -8,7 +8,7 @@ permissions:
pull-requests: write pull-requests: write
contents: read contents: read
concurrency: concurrency:
group: qa-build-${{ github.head_ref || github.run_id }} group: qa-build-${{ github.head_ref || github.run_id }}
cancel-in-progress: true cancel-in-progress: true
@ -27,11 +27,6 @@ jobs:
with: with:
distribution: "temurin" distribution: "temurin"
java-version: 17 java-version: 17
- name: Install NDK and cmake
if: ${{ steps.check-secrets.outputs.ok == 'true' }}
run: |
source ndk.env
/usr/local/lib/android/sdk/tools/bin/sdkmanager "ndk;${NDK_VERSION}" "cmake;${CMAKE_VERSION}"
- name: Build QA - name: Build QA
if: ${{ steps.check-secrets.outputs.ok == 'true' }} if: ${{ steps.check-secrets.outputs.ok == 'true' }}
env: env:

2
.github/workflows/screenShotTest.yml vendored
View file

@ -88,7 +88,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} 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}} 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 - name: Archive Espresso results
uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0 uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
if: ${{ always() }} if: ${{ always() }}
with: with:
name: Report-${{ matrix.color }}-${{ matrix.scheme }} name: Report-${{ matrix.color }}-${{ matrix.scheme }}

2
.github/workflows/unit-tests.yml vendored
View file

@ -46,7 +46,7 @@ jobs:
fail_ci_if_error: true fail_ci_if_error: true
- name: Upload jacoco artifacts - name: Upload jacoco artifacts
if: ${{ failure() }} if: ${{ failure() }}
uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0 uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
with: with:
name: test-results name: test-results
path: app/build/reports/tests/testGplayDebugUnitTest/ path: app/build/reports/tests/testGplayDebugUnitTest/