From cbe75f2cc8eca396f698c6990cc14052e8aefafa Mon Sep 17 00:00:00 2001 From: Seth Schroeder Date: Mon, 18 Sep 2023 20:26:57 +0200 Subject: [PATCH 1/2] fastlane: do not increment version code in develop branch --- fastlane/Fastfile | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 34277832ed..db3a2b037c 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -55,19 +55,4 @@ lane :prod do |options| release_status: "draft", skip_upload_apk: true ) - - ensure_git_status_clean - sh "git checkout develop" - sh "git pull" - - # increment version code in develop - increment_version_code_in_properties_file( - key: "VERSION_CODE", - path: "./app/version.properties" - ) - - sh("git config user.name github-actions") - sh("git config user.email noreply@github.com") - git_commit(path: "./app/version.properties", message: "chore (release): version bump") - push_to_git_remote end \ No newline at end of file From 82f5d83eb354502d465eb3e49c21563aeb5f9ca2 Mon Sep 17 00:00:00 2001 From: Seth Schroeder Date: Mon, 18 Sep 2023 20:27:29 +0200 Subject: [PATCH 2/2] github actions: save google play key to correct file --- .github/workflows/production.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml index 068d8919f3..2183ef109c 100644 --- a/.github/workflows/production.yml +++ b/.github/workflows/production.yml @@ -51,7 +51,7 @@ jobs: - name: Create Google Play service account key env: GOOGLE_PLAY_SERVICE_ACCOUNT: ${{ secrets.GOOGLE_PLAY_SERVICE_ACCOUNT }} - run: echo "$GOOGLE_PLAY_SERVICE_ACCOUNT" > google-play-service-account.json + run: echo "$GOOGLE_PLAY_SERVICE_ACCOUNT" > app/play-service-account-key.json - name: Build apk with fastlane run: bundle exec fastlane prod github_token:${{ secrets.GITHUB_TOKEN }}