ci android?

Tiebe · Feb 10, 2024 · d217dee · d217dee
1 parent c60d4b1
commit d217dee
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 148 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -17,11 +17,42 @@ jobs:
 
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
-    - name: Build with Gradle
-      run: ./gradlew build
-      env:
-        USERNAME: ${{ secrets.USERNAME }}
-        TOKEN: ${{ secrets.ACCESS_TOKEN }}
+
+    - name: Assemble Release Bundle
+      run: |
+        ./gradlew bundleRelease
+    - name: Sign Release Android
+      uses: r0adkll/sign-android-release@v1
+      id: sign_app_android
+      with:
+        releaseDirectory: androidApp/build/outputs/bundle/release
+        signingKeyBase64: ${{ secrets.SIGNING_KEY }}
+        alias: ${{ secrets.ALIAS }}
+        keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
+        keyPassword: ${{ secrets.KEY_PASSWORD }}
+
+    - name: Sign Release Wear OS
+      uses: r0adkll/sign-android-release@v1
+      id: sign_app_wear
+      with:
+        releaseDirectory: wearApp/build/outputs/bundle/release
+        signingKeyBase64: ${{ secrets.SIGNING_KEY }}
+        alias: ${{ secrets.ALIAS }}
+        keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
+        keyPassword: ${{ secrets.KEY_PASSWORD }}
+
+
+    - name: Upload release
+      uses: r0adkll/upload-google-play@v1
+      with:
+        serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
+        packageName: nl.tiebe.otarium
+        releaseFiles: ${{steps.sign_app_android.outputs.signedReleaseFile}},${{steps.sign_app_wear.outputs.signedReleaseFile}}
+        track: production
+        whatsNewDirectory: whatsNew
+        changesNotSentForReview: true
+
+
     - name: Upload a Build Artifact
       uses: actions/upload-artifact@v3.1.3
       with:

diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
diff --git a/.github/workflows/ios_beta.yml b/.github/workflows/ios_beta.yml
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -17,5 +17,5 @@ dependencyResolutionManagement {
 rootProject.name = "Otarium"
 
 include(":androidApp")
-include(":shared")
 include(":wearApp")
+include(":shared")
diff --git a/whatsNew/whatsnew-en-US b/whatsNew/whatsnew-en-US
@@ -0,0 +1 @@
+Bug fixes and separate PTA