merge: v2.6.12 + cache fix (#7 )

Reviewed-on: #7
Merge branch 'develop' into release/2.6.12
2024-05-23 09:08:17 -05:00 · 2024-05-23 09:07:44 -05:00 · 2024-05-23 16:07:23 +02:00
1 changed files with 2 additions and 3 deletions
--- a/.gitea/workflows/build_android.yml
+++ b/.gitea/workflows/build_android.yml
@ -10,7 +10,6 @@ on:

 jobs:
    build:
-
        runs-on: ubuntu-latest

        env:
@ -29,7 +28,7 @@ jobs:
            -   name: Set up JDK
                uses: actions/setup-java@v3
                with:
-                    distribution: 'zulu' # See 'Supported distributions' for available options
+                    distribution: 'zulu'
                    java-version: '17'
                    cache: 'gradle'

@ -55,7 +54,7 @@ jobs:

            -   name: Get app version
                id: get_version
-                run: echo "VERSION_NAME=$(grep -m1 "versionName" app/build.gradle | awk '{print $2}' | tr -d \''"\')" >> $GITHUB_ENV
+                run: echo "VERSION_NAME=$(grep -m1 "versionName" app/build.gradle | awk '{print $2}' | tr -d \'\'\"\')" >> $GITHUB_ENV

            -   name: Change wrapper permissions
                run: chmod +x ./gradlew
Author	SHA1	Message	Date
Franek	7266d1fcd3	merge: v2.6.12 + cache fix (#7 ) Reviewed-on: #7	2024-05-23 09:08:17 -05:00
Franek	e048fe4c35	Merge branch 'develop' into release/2.6.12 All checks were successful Generate APK / build (pull_request) Successful in 34m25s Details	2024-05-23 09:07:44 -05:00
Franek	49541e9a7d	chore: updated workflow	2024-05-23 16:07:23 +02:00