From 2150cafdb64e39455bfeb79a1913f7b3d704bc84 Mon Sep 17 00:00:00 2001 From: Arnaud Vergnet Date: Sat, 24 Jun 2023 18:14:52 +0200 Subject: [PATCH] [android] Update github ci script to new android structure Signed-off-by: Arnaud Vergnet --- .github/workflows/android-check-metadata.yaml | 4 ++-- .github/workflows/android-check.yaml | 6 +++--- .github/workflows/android-monkey.yaml | 2 +- .github/workflows/android-release.yaml | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/android-check-metadata.yaml b/.github/workflows/android-check-metadata.yaml index 10ae5651b6..a2f55a8994 100644 --- a/.github/workflows/android-check-metadata.yaml +++ b/.github/workflows/android-check-metadata.yaml @@ -4,8 +4,8 @@ on: pull_request: paths: - .github/workflows/android-check-metadata.yaml # Run check on self change - - android/src/fdroid/** - - android/src/google/** + - android/app/src/main/fdroid/** + - android/app/src/main/google/** - tools/python/check_store_metadata.py jobs: diff --git a/.github/workflows/android-check.yaml b/.github/workflows/android-check.yaml index f2628b7718..fd5e3a175d 100644 --- a/.github/workflows/android-check.yaml +++ b/.github/workflows/android-check.yaml @@ -14,8 +14,8 @@ on: - LICENSE - NOTICE - README.md - - android/src/fdroid/** - - android/src/google/** + - android/app/src/main/fdroid/** + - android/app/src/main/google/** - iphone/** - data/strings/** - docs/** @@ -106,5 +106,5 @@ jobs: uses: actions/upload-artifact@v3 with: name: android-arm64-v8a-${{ matrix.flavor }} - path: android/build/outputs/apk/**/OrganicMaps-*.apk + path: android/app/build/outputs/apk/**/OrganicMaps-*.apk if-no-files-found: error diff --git a/.github/workflows/android-monkey.yaml b/.github/workflows/android-monkey.yaml index 10dae7eaee..b209651cbf 100644 --- a/.github/workflows/android-monkey.yaml +++ b/.github/workflows/android-monkey.yaml @@ -82,7 +82,7 @@ jobs: run: | gcloud auth activate-service-account --key-file android/firebase-test-lab.json gcloud config set project omapsapp - gcloud firebase test android run --app ./android/build/outputs/apk/google/debug/OrganicMaps-*-google-debug.apk \ + gcloud firebase test android run --app ./android/app/build/outputs/apk/google/debug/OrganicMaps-*-google-debug.apk \ --device model=panther,version=33 \ --device model=bluejay,version=32 \ --device model=b2q,version=31 \ diff --git a/.github/workflows/android-release.yaml b/.github/workflows/android-release.yaml index 8a2a9ecb57..36f403af17 100644 --- a/.github/workflows/android-release.yaml +++ b/.github/workflows/android-release.yaml @@ -3,8 +3,8 @@ on: workflow_dispatch: # Manual trigger env: - RELEASE_NOTES: android/src/google/play/release-notes/en-US/default.txt - FDROID_VERSION: android/src/fdroid/play/version.yaml + RELEASE_NOTES: android/app/src/main/google/play/release-notes/en-US/default.txt + FDROID_VERSION: android/app/src/main/fdroid/play/version.yaml JAVA_HOME: /usr/lib/jvm/temurin-17-jdk-amd64 # Java 17 is required for Android Gradle 8 plugin jobs: @@ -151,7 +151,7 @@ jobs: echo "" echo "sha256sum:" echo -e '\n```' - (cd ./android/build/outputs/apk/web/release/ && sha256sum OrganicMaps-${{ needs.tag.outputs.code }}-web-release.apk) | tr -d '\n' + (cd ./android/app/build/outputs/apk/web/release/ && sha256sum OrganicMaps-${{ needs.tag.outputs.code }}-web-release.apk) | tr -d '\n' echo -e '\n```' } > ${{ runner.temp }}/release-notes.txt @@ -164,5 +164,5 @@ jobs: name: ${{ needs.tag.outputs.tag }} tag_name: ${{ needs.tag.outputs.tag }} discussion_category_name: 'Announcements' - files: ./android/build/outputs/apk/web/release/OrganicMaps-${{ needs.tag.outputs.code }}-web-release.apk + files: ./android/app/build/outputs/apk/web/release/OrganicMaps-${{ needs.tag.outputs.code }}-web-release.apk fail_on_unmatched_files: true