From 19c7176edac3e89323b6ae927a79248dd10d3add Mon Sep 17 00:00:00 2001 From: shocknet-justin <34176400+shocknet-justin@users.noreply.github.com> Date: Thu, 12 Sep 2024 23:59:12 -0400 Subject: [PATCH 1/5] source env --- .github/workflows/android-build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml index 62ccb14e..8a342eeb 100644 --- a/.github/workflows/android-build.yml +++ b/.github/workflows/android-build.yml @@ -51,7 +51,9 @@ jobs: echo "VERSION_CODE=$(git rev-list --count HEAD)" >> $GITHUB_ENV - name: Run pre-build script - run: VERSION=${{ env.VERSION }} VERSION_CODE=${{ env.VERSION_CODE }} npm run prebuild + run: | + source .env + VERSION=${{ env.VERSION }} VERSION_CODE=${{ env.VERSION_CODE }} npm run prebuild - name: Build Android app run: ionic cap build android --no-interactive From 9bd3d32476cb8f3e537e8662babfd9609124652e Mon Sep 17 00:00:00 2001 From: shocknet-justin <34176400+shocknet-justin@users.noreply.github.com> Date: Fri, 13 Sep 2024 00:12:37 -0400 Subject: [PATCH 2/5] test ver --- .github/workflows/android-build.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml index 8a342eeb..55483690 100644 --- a/.github/workflows/android-build.yml +++ b/.github/workflows/android-build.yml @@ -46,7 +46,7 @@ jobs: if [[ ${{ github.event_name }} == 'release' ]]; then echo "VERSION=${{ github.ref_name }}" >> $GITHUB_ENV else - echo "VERSION=test" >> $GITHUB_ENV + echo "VERSION=$(git rev-parse --short HEAD)" >> $GITHUB_ENV fi echo "VERSION_CODE=$(git rev-list --count HEAD)" >> $GITHUB_ENV @@ -56,7 +56,10 @@ jobs: VERSION=${{ env.VERSION }} VERSION_CODE=${{ env.VERSION_CODE }} npm run prebuild - name: Build Android app - run: ionic cap build android --no-interactive + run: | + source .env + ionic cap sync android + ionic cap build android --no-interactive --prod - name: Set up JDK 17 uses: actions/setup-java@v3 From 013d1c513210a17bdc06fd6ae673558e664d1dc4 Mon Sep 17 00:00:00 2001 From: shocknet-justin <34176400+shocknet-justin@users.noreply.github.com> Date: Fri, 13 Sep 2024 10:46:13 -0400 Subject: [PATCH 3/5] build envs --- android/app/build.gradle | 1 + android/app/src/main/AndroidManifest.xml | 7 +++---- preBuild/preBuild.ts | 21 ++++++++++++++++----- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 723e6d66..ec417898 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -15,6 +15,7 @@ android { // Default: https://android.googlesource.com/platform/frameworks/base/+/282e181b58cf72b6ca770dc7ca5f91f135444502/tools/aapt/AaptAssets.cpp#61 ignoreAssetsPattern '!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~' } + resValue "string", "app_name", "gradle default" // This will be replaced by the preBuild script } buildTypes { release { diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 71e77106..4d8a9937 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -12,7 +12,6 @@ @@ -21,7 +20,7 @@ - + @@ -30,7 +29,7 @@ - + @@ -43,7 +42,7 @@ - + diff --git a/preBuild/preBuild.ts b/preBuild/preBuild.ts index e474dff9..52d2c47b 100644 --- a/preBuild/preBuild.ts +++ b/preBuild/preBuild.ts @@ -5,9 +5,14 @@ const path = require('path'); // Read and modify the AndroidManifest.xml file const androidManifestPath = 'android/app/src/main/AndroidManifest.xml'; -let androidManifest = fs.readFileSync('preBuild/AndroidManifest.copy.xml', 'utf8'); -androidManifest = androidManifest.replace('${appUrl}', process.env.VITE_APP_URL); -androidManifest = androidManifest.replace('${appName}', process.env.VITE_APP_NAME); +let androidManifest = fs.readFileSync(androidManifestPath, 'utf8'); + +// Replace the app URL +androidManifest = androidManifest.replace( + / Date: Fri, 13 Sep 2024 11:03:58 -0400 Subject: [PATCH 4/5] up --- preBuild/preBuild.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/preBuild/preBuild.ts b/preBuild/preBuild.ts index 52d2c47b..b12e6803 100644 --- a/preBuild/preBuild.ts +++ b/preBuild/preBuild.ts @@ -56,7 +56,7 @@ function updateBuildGradle(version, versionCode, applicationId, appName) { ); buildGradle = buildGradle.replace( - /resValue "string", "app_name", "[^"]+/, + /resValue "string", "app_name", "[^"]+"/, `resValue "string", "app_name", "${appName}"` ); From 1b00c5c38ac3b411ee080ed31a25fc7af654595d Mon Sep 17 00:00:00 2001 From: shocknet-justin <34176400+shocknet-justin@users.noreply.github.com> Date: Fri, 13 Sep 2024 14:13:05 -0400 Subject: [PATCH 5/5] fix? --- .github/workflows/android-build.yml | 3 ++- android/app/src/main/AndroidManifest.xml | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml index 55483690..13e350ea 100644 --- a/.github/workflows/android-build.yml +++ b/.github/workflows/android-build.yml @@ -45,10 +45,11 @@ jobs: run: | if [[ ${{ github.event_name }} == 'release' ]]; then echo "VERSION=${{ github.ref_name }}" >> $GITHUB_ENV + echo "VERSION_CODE=$(git rev-list --count HEAD)" >> $GITHUB_ENV else echo "VERSION=$(git rev-parse --short HEAD)" >> $GITHUB_ENV + echo "VERSION_CODE=$(git rev-list --count HEAD)" >> $GITHUB_ENV fi - echo "VERSION_CODE=$(git rev-list --count HEAD)" >> $GITHUB_ENV - name: Run pre-build script run: | diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 4d8a9937..279b84ca 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ -