From 097abc5f29f23a9d9edb1ab98386a30936b2136d Mon Sep 17 00:00:00 2001 From: Remy Moll Date: Wed, 25 Sep 2024 16:52:32 +0200 Subject: [PATCH] remove gradle again --- .../.github/workflows/build_app_android.yaml | 19 +++++++++++++------ frontend/android/.gitignore | 3 +++ frontend/android/fastlane/Fastfile | 10 +++++++--- 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/frontend/.github/workflows/build_app_android.yaml b/frontend/.github/workflows/build_app_android.yaml index 67c6162..cb008bc 100644 --- a/frontend/.github/workflows/build_app_android.yaml +++ b/frontend/.github/workflows/build_app_android.yaml @@ -1,7 +1,7 @@ on: push: - branches: - - main + tags: + - 'v*' jobs: build: @@ -23,6 +23,13 @@ jobs: - name: Setup android SDK uses: android-actions/setup-android@v3 + + - name: Install Flutter + uses: subosito/flutter-action@v2 + with: + channel: stable + flutter-version: 3.22.0 + cache: true - name: Infer version number from git tag id: version @@ -30,13 +37,14 @@ jobs: REF_NAME: ${{ github.ref_name }} run: # remove the 'v' prefix from the tag name - echo "VERSION=${REF_NAME//v}" >> $GITHUB_OUTPUT + echo "VERSION_NAME=${REF_NAME//v}" >> $GITHUB_ENV - name: Load secrets from github run: | echo "${{ secrets.ANDROID_SECRET_PROPERTIES }}" > secrets.properties - echo "${{ secrets.ANDROID_KEYSTORE }}" > release.keystore echo "${{ secrets.ANDROID_GOOGLE_PLAY_JSON }}" > google-key.json + # decode the base64 encoded google key + echo "${{ secrets.ANDROID_KEYSTORE_BASE64 }}" | base64 -d - > release.keystore working-directory: android - name: Install fastlane @@ -46,5 +54,4 @@ jobs: - name: Run fastlane lane run: bundle exec fastlane deploy_testing working-directory: android - env: - VERSION_NAME: ${{ steps.version.VERSION }} + # the environment variable VERSION_NAME is implicitly available diff --git a/frontend/android/.gitignore b/frontend/android/.gitignore index 609e083..7d38cdd 100644 --- a/frontend/android/.gitignore +++ b/frontend/android/.gitignore @@ -1,3 +1,6 @@ +gradlew +gradlew.bat +gradle/ /.gradle /captures/ /local.properties diff --git a/frontend/android/fastlane/Fastfile b/frontend/android/fastlane/Fastfile index f1f9177..5b37b24 100644 --- a/frontend/android/fastlane/Fastfile +++ b/frontend/android/fastlane/Fastfile @@ -7,10 +7,14 @@ platform :android do desc "Deploy a new version as a preview version" lane :deploy_testing do + version_name = ENV["VERSION_NAME"] + sh( - "flutter build appbundle --release", - "--build-name=", - ENV["VERSION_NAME"], + "flutter", + "build", + "appbundle", + "--release", + "--build-name=#{version_name}", ) upload_to_play_store(