simplify

bitdriftlabs · Dec 9, 2024 · ba27da4 · ba27da4
1 parent 49e60bb
commit ba27da4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 25 deletions.
diff --git a/.github/workflows/integrations_android.yaml b/.github/workflows/integrations_android.yaml
@@ -59,17 +59,17 @@ jobs:
       uses: actions/upload-artifact@v4
       with:
         name: capture-timber.zip
-        path: platform/jvm/capture-timber.zip
+        path: platform/jvm/capture-timber-${{ inputs.version }}.android.zip
         if-no-files-found: error
     - name: Upload Apollo artifacts
       uses: actions/upload-artifact@v4
       with:
         name: capture-apollo3.zip
-        path: platform/jvm/capture-apollo3.zip
+        path: platform/jvm/capture-apollo3-${{ inputs.version }}.android.zip
         if-no-files-found: error        
     - name: Upload Gradle Plugin artifacts
       uses: actions/upload-artifact@v4
       with:
         name: capture-plugin.zip
-        path: platform/jvm/capture-plugin.zip
+        path: platform/jvm/capture-plugin-${{ inputs.version }}.android.zip
         if-no-files-found: error
diff --git a/.github/workflows/release_gh.yaml b/.github/workflows/release_gh.yaml
@@ -230,7 +230,7 @@ jobs:
             "example-apps.ios.zip" \
             "example-apps.android.zip" \
             "capture-timber-$VERSION.android.zip" \
-            "capture-apollo3-$VERSION.android.zip" \            
+            "capture-apollo3-$VERSION.android.zip" \
             "capture-plugin-$VERSION.android.zip"
         env:
           VERSION: ${{ inputs.version }}

diff --git a/ci/gh_prepare_android_artifacts.sh b/ci/gh_prepare_android_artifacts.sh
@@ -40,25 +40,4 @@ function prepare_capture_sdk() {
   popd
 }
 
-function prepare_capture_timber() {
-  echo "+++ Preparing Android Capture Timber library artifacts for '$version' version"
-
-  cp "$sdk_repo/capture-timber.zip" "$sdk_repo/capture-timber-$version.android.zip"
-}
-
-function prepare_capture_apollo3() {
-  echo "+++ Preparing Android Capture Apollo3 library artifacts for '$version' version"
-
-  cp "$sdk_repo/capture-apollo3.zip" "$sdk_repo/capture-apollo4-$version.android.zip"
-}
-
-function prepare_capture_plugin() {
-  echo "+++ Preparing Android Capture Android Plugin artifacts for '$version' version"
-
-  cp "$sdk_repo/capture-plugin.zip" "$sdk_repo/capture-plugin-$version.android.zip"
-}
-
 prepare_capture_sdk
-prepare_capture_timber
-prepare_capture_apollo3
-prepare_capture_plugin