From 16a947ed70dabd3591abd479de9a1da439e09968 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Gonz=C3=A1lez?= <malmstein@gmail.com>
Date: Thu, 14 Nov 2024 16:07:38 +0100
Subject: [PATCH] GHA: fix duplicate step id (#5273)

Task/Issue URL:
https://app.asana.com/0/inbox/1157893581871899/1208764131137352/1208764131137354

### Description
Fix duplicate ids and fastlane config for deployment


---
- To see the specific tasks where the Asana app for GitHub is being
used, see below:
  - https://app.asana.com/0/0/1208764131137352
---
 .github/workflows/release_upload_play_store.yml | 12 +++---------
 fastlane/Fastfile                               |  2 +-
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/release_upload_play_store.yml b/.github/workflows/release_upload_play_store.yml
index 754904402463..56e8bb69b2e1 100644
--- a/.github/workflows/release_upload_play_store.yml
+++ b/.github/workflows/release_upload_play_store.yml
@@ -63,7 +63,7 @@ jobs:
           destination-path: $HOME/jenkins_static/com.duckduckgo.mobile.android/
 
       - name: Assemble the bundle
-        run: ./gradleW bundleRelease -PuseUploadSigning
+        run: ./gradlew bundleRelease -PuseUploadSigning
 
       - name: Capture App Bundle Path
         id: capture_output
@@ -72,21 +72,15 @@ jobs:
           echo "bundle_path=$output" >> $GITHUB_OUTPUT
 
       - name: Upload bundle to Play Store
-        id: create_app_bundle
+        id: upload_bundle_play
         run: |
           bundle exec fastlane deploy_playstore
 
       - name: Upload Universal APK to Github
-        id: create_app_bundle
+        id: upload_bundle_github
         run: |
           bundle exec fastlane deploy_github
 
-      - name: Upload APK as artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: duckduckgo-${{ steps.generate_version_name.outputs.version }}.apk
-          path: duckduckgo.apk
-
       - name: Create Asana task when workflow failed
         if: ${{ failure() }}
         uses: duckduckgo/native-github-asana-sync@v1.1
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index c57356ffaa95..5ee535601ef2 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -209,7 +209,7 @@ platform :android do
     version = props["VERSION"]
     releaseNotes = release_notes_github()
     apkPath = "app/build/outputs/apk/play/release/duckduckgo-#{version}-play-release.apk"
-    token = ENV["GITHUB_UPLOAD_TOKEN"]
+    token = ENV["GH_TOKEN"]
 
     UI.message ("Upload new app version to GitHub\nVersion: #{version}\nRelease Notes:\n=====\n#{releaseNotes}\n=====\n")