From 01aa9808965c74e50d80ac60d38673afa0c21701 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Gonz=C3=A1lez?= <malmstein@gmail.com>
Date: Wed, 23 Oct 2024 14:29:17 +0200
Subject: [PATCH] add tagging step for nightly release

---
 .github/workflows/release_upload_bundle.yml | 54 +++++++++++----------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/release_upload_bundle.yml b/.github/workflows/release_upload_bundle.yml
index 7520d98f9854..5657da6a8cc6 100644
--- a/.github/workflows/release_upload_bundle.yml
+++ b/.github/workflows/release_upload_bundle.yml
@@ -6,12 +6,8 @@ on:
 env:
   ASANA_PAT: ${{ secrets.GH_ASANA_SECRET }}
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
-  upload-nightly-bundle:
+  create-tag:
     name: Generate and upload nightly bundle to Play Store Internal track
     runs-on: macos-latest
 
@@ -21,11 +17,12 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Set up ruby env
-        uses: ruby/setup-ruby@v1
+      - name: Get Previous tag
+        id: fetch_tag
+        uses: oprypin/find-latest-tag@v1
         with:
-          ruby-version: 2.7.2
-          bundler-cache: true
+          repository: duckduckgo/android
+          prefix: '5.'
 
       - name: Decode upload keys
         uses: davidSchuppa/base64Secret-toFile-action@v2
@@ -38,36 +35,41 @@ jobs:
         uses: davidSchuppa/base64Secret-toFile-action@v2
         with:
           secret: ${{ secrets.UPLOAD_RELEASE_KEY }}
-          fileName: android
+          fileName: ddg-upload-keystore.jks
           destination-path: $HOME/jenkins_static/com.duckduckgo.mobile.android/
 
+      - name: Generate nightly version name
+        id: generate_version_name
+        run: |
+          output=$(./gradlew -q getBuildVersionName -PversionNameSuffix=-nightly --quiet)        
+          echo "::set-output name=version::$output"
+
       - name: Assemble the bundle
-        run: ./gradlew bundleInternalRelease -PversionNameSuffix=-nightly -PuseUploadSigning
+        run: ./gradlew bundleInternalRelease -PversionNameSuffix=-nightly -PuseUploadSigning -PlatestTag=${{ steps.fetch_tag.outputs.tag }}
 
       - name: Capture App Bundle Path
         id: capture_output
         run: |
-          output=$(ls app/build/outputs/bundle/internalRelease/*.aab)
+          output=$(find app/build/outputs/bundle/internalRelease -name "*.aab")
           echo "bundle_path=$output" >> $GITHUB_OUTPUT
 
-      - name: Use the captured bundle path
-        run: |
-          echo "The generated app bundle is located at: ${{ steps.capture_output.outputs.bundle_path }}"
-
-      - name: Generate nightly version name
-        id: generate_version_name
+      - name: Upload bundle to Play Store Internal track
+        id: create_app_bundle
         run: |
-          output=$(./gradlew -q getBuildVersionName -PversionNameSuffix=-nightly --quiet)                  
-          echo "version=$output" >> $GITHUB_OUTPUT
+          bundle exec fastlane deploy_dogfood aab_path:${{ steps.capture_output.outputs.bundle_path }}
 
-      - name: Use the captured output
+      - name: Tag Nightly release
+        id: tag_nightly_release
         run: |
-          echo "The captured output is: ${{ steps.generate_version_name.outputs.version }}"
+          git tag -a ${{ steps.generate_version_name.outputs.version }} -m "Create tag ${{ steps.generate_version_name.outputs.version }} for nightly release."
+          git remote set-url origin https://${{ secrets.GT_DAXMOBILE }}@github.com/duckduckgo/Android.git/
+          git push origin ${{ steps.generate_version_name.outputs.version }}
 
-      - name: Upload bundle to internal
-        id: create_app_bundle
-        run: |
-          bundle exec fastlane deploy_dogfood aab_path:app/build/outputs/bundle/internalRelease/duckduckgo-${{ steps.generate_version_name.outputs.version }}-internal-release.aab          
+      - name: Upload app bundle 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() }}