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

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

View file

@ -8,7 +8,7 @@ permissions:
pull-requests: write
contents: read
concurrency:
concurrency:
group: qa-build-${{ github.head_ref || github.run_id }}
cancel-in-progress: true
@ -27,11 +27,6 @@ jobs:
with:
distribution: "temurin"
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
if: ${{ steps.check-secrets.outputs.ok == 'true' }}
env:

View file

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

View file

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