From d41fa6fa8494ecd016f511bfbf782e5c345d4c48 Mon Sep 17 00:00:00 2001
From: Vadim <44135514+vodemn@users.noreply.github.com>
Date: Wed, 9 Aug 2023 16:39:41 +0200
Subject: [PATCH] ML-61 Download each artifact separately (#102)

* Download each artifact separately

* typo

* Updated setup-java action

* Extract merged native libs directly in GP release job
---
 .github/workflows/create_release.yml | 45 ++++++++++------------------
 1 file changed, 16 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml
index ca00c25..71248ac 100644
--- a/.github/workflows/create_release.yml
+++ b/.github/workflows/create_release.yml
@@ -37,7 +37,7 @@ jobs:
         with:
           submodules: recursive
 
-      - uses: actions/setup-java@v2
+      - uses: actions/setup-java@v3
         with:
           distribution: "zulu"
           java-version: "11"
@@ -152,16 +152,19 @@ jobs:
     permissions:
       contents: write
     steps:
-      - name: Download apk & release notes
+      - name: Download apk
         uses: actions/download-artifact@v3
         with:
-          name: |
-            m3_lightmeter_apk
-            whatsnew-en-US
+          name: m3_lightmeter_apk
 
       - name: Rename apk
         run: mv app-prod-release.apk m3_lightmeter.apk
 
+      - name: Download release notes
+        uses: actions/download-artifact@v3
+        with:
+          name: whatsnew-en-US
+
       - uses: ncipollo/release-action@v1.12.0
         with:
           artifacts: "m3_lightmeter.apk"
@@ -174,9 +177,10 @@ jobs:
         with:
           name: m3_lightmeter_apk
 
-  extract-merged-native-libs:
-    name: Extract merged native libraries
-    needs: [build]
+  create-google-play-release:
+    name: Create Google Play release
+    if: github.ref_name == 'main'
+    needs: [generate-release-notes]
     runs-on: ubuntu-latest
     steps:
       - name: Download app bundle
@@ -189,31 +193,16 @@ jobs:
           unzip app-prod-release.aab
           (cd base/lib && zip -r "$OLDPWD/merged_native_libs.zip" .)
 
-      - name: Upload merged native libs to artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: merged_native_libs
-          path: merged_native_libs.zip
-
-  create-google-play-release:
-    name: Create Google Play release
-    if: github.ref_name == 'main'
-    needs: [generate-release-notes, extract-merged-native-libs]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Download app bundle & merged native libs
+      - name: Download release notes
         uses: actions/download-artifact@v3
         with:
-          name: |
-            m3_lightmeter_bundle
-            merged_native_libs
-            whatsnew-en-US
+          name: whatsnew-en-US
 
       - name: Move release notes to a folder
         run: |
           mkdir whatsnew
           mv whatsnew-en-US.md whatsnew
-          
+
       - name: Create Google Play release
         id: create-google-play-release-step
         uses: r0adkll/upload-google-play@v1.1.1
@@ -243,9 +232,7 @@ jobs:
         if: ${{ always() }}
         uses: geekyeggo/delete-artifact@v2
         with:
-          name: |
-            m3_lightmeter_bundle
-            merged_native_libs
+          name: m3_lightmeter_bundle
 
   cleanup:
     name: Cleanup