From a53f4c7e5f4f79fac9edc58e113795dc0946ec14 Mon Sep 17 00:00:00 2001 From: dogi Date: Tue, 2 Jul 2024 17:16:25 -0400 Subject: [PATCH 1/8] Update android-release.yml --- .github/workflows/android-release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/android-release.yml b/.github/workflows/android-release.yml index b31816b61a..cf84c55515 100644 --- a/.github/workflows/android-release.yml +++ b/.github/workflows/android-release.yml @@ -15,7 +15,7 @@ jobs: matrix: build: [default, lite] env: - FILES: | + LITES: | app/src/main/AndroidManifest.xml app/src/main/java/org/ole/planet/myplanet/base/PermissionActivity.kt app/src/main/java/org/ole/planet/myplanet/base/BaseContainerFragment.kt @@ -39,7 +39,7 @@ jobs: echo "ANDROID_VERSION_NAME_ORIG=${ANDROID_VERSION_NAME}" >> $GITHUB_ENV ls -al app/build.gradle sed -i 's/\(versionName "[0-9.]\+\)"/\1-lite"/' app/build.gradle - echo "${{ env.FILES }}" | xargs -n 1 | while read file; do + echo "${{ env.LITES }}" | xargs -n 1 | while read file; do ls -al $file* cp "${file}.lite" "$file" done From 0ac12df4fd5101d5da8c9ab09dffe37ae1897370 Mon Sep 17 00:00:00 2001 From: dogi Date: Tue, 2 Jul 2024 17:16:52 -0400 Subject: [PATCH 2/8] Update android-build.yml --- .github/workflows/android-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml index d761a4939c..9748b7608f 100644 --- a/.github/workflows/android-build.yml +++ b/.github/workflows/android-build.yml @@ -15,7 +15,7 @@ jobs: matrix: build: [default, lite] env: - FILES: | + LITES: | app/src/main/AndroidManifest.xml app/src/main/java/org/ole/planet/myplanet/base/PermissionActivity.kt app/src/main/java/org/ole/planet/myplanet/base/BaseContainerFragment.kt @@ -30,7 +30,7 @@ jobs: - name: check for .lite diffs if: matrix.build == 'lite' run: | - echo "${{ env.FILES }}" | xargs -n 1 | while read file; do + echo "${{ env.LITES }}" | xargs -n 1 | while read file; do ls -al $file* diff "$file" "$file.lite" || true done From 7eb01282d3b298d36cf68848a214b380d8dd8886 Mon Sep 17 00:00:00 2001 From: dogi Date: Tue, 2 Jul 2024 17:19:37 -0400 Subject: [PATCH 3/8] Update android-release.yml --- .github/workflows/android-release.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/android-release.yml b/.github/workflows/android-release.yml index cf84c55515..078111928d 100644 --- a/.github/workflows/android-release.yml +++ b/.github/workflows/android-release.yml @@ -20,6 +20,11 @@ jobs: app/src/main/java/org/ole/planet/myplanet/base/PermissionActivity.kt app/src/main/java/org/ole/planet/myplanet/base/BaseContainerFragment.kt app/src/main/java/org/ole/planet/myplanet/ui/dashboard/DashboardActivity.kt + OUTPUTS: | + .apk + .apk.sha256 + .aab + .aab.sha256 steps: - name: checkout repository code From 80ad68f2fd5a84378e52f9574972320e59f47cab Mon Sep 17 00:00:00 2001 From: dogi Date: Tue, 2 Jul 2024 17:26:42 -0400 Subject: [PATCH 4/8] Update android-release.yml --- .github/workflows/android-release.yml | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/.github/workflows/android-release.yml b/.github/workflows/android-release.yml index 078111928d..0fbf7835b6 100644 --- a/.github/workflows/android-release.yml +++ b/.github/workflows/android-release.yml @@ -123,13 +123,12 @@ jobs: - name: rename APK and AAB with version and branch for artifact if: github.event_name == 'workflow_dispatch' run: | - mv output/myPlanet.apk output/myPlanet-${{ env.ANDROID_VERSION_NAME }}-${{ env.BRANCHNAME }}.apk - mv output/myPlanet.apk.sha256 output/myPlanet-${{ env.ANDROID_VERSION_NAME }}-${{ env.BRANCHNAME }}.apk.sha256 - mv output/myPlanet.aab output/myPlanet-${{ env.ANDROID_VERSION_NAME }}-${{ env.BRANCHNAME }}.aab - mv output/myPlanet.aab.sha256 output/myPlanet-${{ env.ANDROID_VERSION_NAME }}-${{ env.BRANCHNAME }}.aab.sha256 - ls -alR output echo "BRANCHNAME=${GITHUB_REF##*/}" >> $GITHUB_ENV - + echo "${{ env.OUTPUTS }}" | xargs -n 1 | while read type; do + mv "output/myPlanet${type}" "output/myPlanet-${{ env.ANDROID_VERSION_NAME }}-${{ env.BRANCHNAME }}${type}" + done + ls -alR output + - name: upload APK and AAB as build artifact if: github.event_name == 'workflow_dispatch' uses: actions/upload-artifact@v4 @@ -141,10 +140,9 @@ jobs: - name: pre-process files and tag for lite version if: github.event_name != 'workflow_dispatch' && matrix.build == 'lite' run: | - mv output/myPlanet.apk output/myPlanet-lite.apk - mv output/myPlanet.apk.sha256 output/myPlanet-lite.apk.sha256 - mv output/myPlanet.aab output/myPlanet-lite.aab - mv output/myPlanet.aab.sha256 output/myPlanet-lite.aab.sha256 + echo "${{ env.OUTPUTS }}" | xargs -n 1 | while read type; do + mv "output/myPlanet${type}" "output/myPlanet-lite${type}" + done echo "ANDROID_VERSION_NAME=${ANDROID_VERSION_NAME_ORIG}" >> $GITHUB_ENV - name: release APK and AAB on GitHub From 567c75f17736680872acfc8a427e6a681c492b16 Mon Sep 17 00:00:00 2001 From: dogi Date: Tue, 2 Jul 2024 17:29:44 -0400 Subject: [PATCH 5/8] Update android-build.yml --- .github/workflows/android-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml index 9748b7608f..ff9ad4a4d0 100644 --- a/.github/workflows/android-build.yml +++ b/.github/workflows/android-build.yml @@ -40,7 +40,7 @@ jobs: run: | ls -al app/build.gradle sed -i 's/\(versionName "[0-9.]\+\)"/\1-lite"/' app/build.gradle - echo "${{ env.FILES }}" | xargs -n 1 | while read file; do + echo "${{ env.LITES }}" | xargs -n 1 | while read file; do ls -al $file* cp "${file}.lite" "$file" done From f58937a91aa3f593e9473657ffa75d87f887570f Mon Sep 17 00:00:00 2001 From: dogi Date: Wed, 3 Jul 2024 14:48:02 -0400 Subject: [PATCH 6/8] Update build.gradle --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index bf08b29d85..1b6dd62cec 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { applicationId "org.ole.planet.myplanet" minSdkVersion 21 targetSdkVersion 34 - versionCode 1646 - versionName "0.16.46" + versionCode 1652 + versionName "0.16.52" ndkVersion '21.3.6528147' testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true From 56e485676383eb238bd1a29b3e2d8da56385a078 Mon Sep 17 00:00:00 2001 From: dogi Date: Wed, 3 Jul 2024 15:00:16 -0400 Subject: [PATCH 7/8] Update android-release.yml --- .github/workflows/android-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/android-release.yml b/.github/workflows/android-release.yml index 64d6a6f25d..d2fcd8e531 100644 --- a/.github/workflows/android-release.yml +++ b/.github/workflows/android-release.yml @@ -118,7 +118,7 @@ jobs: mv "output/myPlanet${type}" "output/myPlanet-${{ env.ANDROID_VERSION_NAME }}-${{ env.BRANCHNAME }}${type}" done ls -alR output - + - name: upload APK and AAB as build artifact if: github.event_name == 'workflow_dispatch' uses: actions/upload-artifact@v4 From 329d30434567815600f6c50d6b6959b42985615d Mon Sep 17 00:00:00 2001 From: dogi Date: Wed, 3 Jul 2024 15:58:23 -0400 Subject: [PATCH 8/8] Update android-release.yml --- .github/workflows/android-release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/android-release.yml b/.github/workflows/android-release.yml index d2fcd8e531..4e5b487e8c 100644 --- a/.github/workflows/android-release.yml +++ b/.github/workflows/android-release.yml @@ -113,11 +113,11 @@ jobs: - name: rename APK and AAB with version and branch for artifact if: github.event_name == 'workflow_dispatch' run: | - echo "BRANCHNAME=${GITHUB_REF##*/}" >> $GITHUB_ENV echo "${{ env.OUTPUTS }}" | xargs -n 1 | while read type; do - mv "output/myPlanet${type}" "output/myPlanet-${{ env.ANDROID_VERSION_NAME }}-${{ env.BRANCHNAME }}${type}" + mv "output/myPlanet${type}" "output/myPlanet-${{ env.ANDROID_VERSION_NAME }}-${GITHUB_REF##*/}${type}" done ls -alR output + echo "BRANCHNAME=${GITHUB_REF##*/}" >> $GITHUB_ENV - name: upload APK and AAB as build artifact if: github.event_name == 'workflow_dispatch'