Skip to content

Commit afe9e8d

Browse files
authored
Merge pull request #101 from ClayPulse/hotfix
Update capacitor build workflow
2 parents 2ad0b41 + b1dd06c commit afe9e8d

File tree

2 files changed

+34
-6
lines changed

2 files changed

+34
-6
lines changed

.github/workflows/build-mobile.yml

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,22 @@ jobs:
3131
java-version: "21"
3232
distribution: "temurin"
3333

34-
- name: Setup Android SDK
35-
uses: android-actions/setup-android@v3
34+
- name: Install Android SDK Command Line Tools
35+
run: |
36+
export ANDROID_SDK_ROOT=$HOME/Android/Sdk
37+
mkdir -p $ANDROID_SDK_ROOT/cmdline-tools
38+
cd $ANDROID_SDK_ROOT/cmdline-tools
39+
wget https://dl.google.com/android/repository/commandlinetools-linux-13114758_latest.zip -O commandlinetools.zip
40+
unzip commandlinetools.zip
41+
rm commandlinetools.zip
42+
mv cmdline-tools latest
43+
echo "$ANDROID_SDK_ROOT/cmdline-tools/latest/bin" >> $GITHUB_PATH
44+
echo "$ANDROID_SDK_ROOT/platform-tools" >> $GITHUB_PATH
3645
3746
- name: Install Android SDK build tools
3847
run: |
48+
export ANDROID_SDK_ROOT=$HOME/Android/Sdk
49+
yes | sdkmanager --licenses
3950
sdkmanager "build-tools;${{env.ANDROID_SDK_VERSION}}"
4051
echo "$ANDROID_SDK_ROOT/build-tools/${{env.ANDROID_SDK_VERSION}}" >> $GITHUB_PATH
4152
@@ -72,5 +83,8 @@ jobs:
7283
working-directory: mobile
7384

7485
- name: Build Capacitor App
75-
run: npx cap build android --keystorepath ~/.keystore/pulse-editor.keystore --keystorepass ${{ secrets.ANDROID_KEYSTORE_PASS }} --androidreleasetype APK
86+
run: |
87+
export ANDROID_SDK_ROOT=$HOME/Android/Sdk
88+
unset ANDROID_HOME
89+
npx cap build android --keystorepath ~/.keystore/pulse-editor.keystore --keystorepass ${{ secrets.ANDROID_KEYSTORE_PASS }} --androidreleasetype APK
7690
working-directory: mobile

.github/workflows/release-mobile.yml

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,22 @@ jobs:
2828
java-version: "21"
2929
distribution: "temurin"
3030

31-
- name: Setup Android SDK
32-
uses: android-actions/setup-android@v3
31+
- name: Install Android SDK Command Line Tools
32+
run: |
33+
export ANDROID_SDK_ROOT=$HOME/Android/Sdk
34+
mkdir -p $ANDROID_SDK_ROOT/cmdline-tools
35+
cd $ANDROID_SDK_ROOT/cmdline-tools
36+
wget https://dl.google.com/android/repository/commandlinetools-linux-13114758_latest.zip -O commandlinetools.zip
37+
unzip commandlinetools.zip
38+
rm commandlinetools.zip
39+
mv cmdline-tools latest
40+
echo "$ANDROID_SDK_ROOT/cmdline-tools/latest/bin" >> $GITHUB_PATH
41+
echo "$ANDROID_SDK_ROOT/platform-tools" >> $GITHUB_PATH
3342
3443
- name: Install Android SDK build tools
3544
run: |
45+
export ANDROID_SDK_ROOT=$HOME/Android/Sdk
46+
yes | sdkmanager --licenses
3647
sdkmanager "build-tools;${{env.ANDROID_SDK_VERSION}}"
3748
echo "$ANDROID_SDK_ROOT/build-tools/${{env.ANDROID_SDK_VERSION}}" >> $GITHUB_PATH
3849
@@ -69,7 +80,10 @@ jobs:
6980
working-directory: mobile
7081

7182
- name: Build Capacitor App
72-
run: npx cap build android --keystorepath ~/.keystore/pulse-editor.keystore --keystorepass ${{ secrets.ANDROID_KEYSTORE_PASS }} --androidreleasetype APK
83+
run: |
84+
export ANDROID_SDK_ROOT=$HOME/Android/Sdk
85+
unset ANDROID_HOME
86+
npx cap build android --keystorepath ~/.keystore/pulse-editor.keystore --keystorepass ${{ secrets.ANDROID_KEYSTORE_PASS }} --androidreleasetype APK
7387
working-directory: mobile
7488

7589
- name: Move APK

0 commit comments

Comments
 (0)