re-structure

bitdriftlabs · Dec 10, 2024 · 40bd70f · 40bd70f
1 parent 37a9b65
commit 40bd70f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/.github/workflows/integrations_android.yaml b/.github/workflows/integrations_android.yaml
@@ -46,30 +46,30 @@ jobs:
     - name: Compress Timber artifacts
       run: |
         readonly dir=$(pwd)
-        (cd capture-timber/build/repos/releases/io/bitdrift/capture-timber/${{ inputs.version }} && zip -r "$dir/capture-timber.zip" ./*)
+        (cd capture-timber/build/repos/releases/io/bitdrift/capture-timber/${{ inputs.version }} && zip -r "$dir/capture-timber-${{ inputs.version }}.android.zip" ./*)
     - name: Compress Apollo artifacts
       run: |
         readonly dir=$(pwd)
-        (cd capture-apollo3/build/repos/releases/io/bitdrift/capture-apollo3/${{ inputs.version }} && zip -r "$dir/capture-apollo3.zip" ./*)        
+        (cd capture-apollo3/build/repos/releases/io/bitdrift/capture-apollo3/${{ inputs.version }} && zip -r "$dir/capture-apollo3-${{ inputs.version }}.android.zip" ./*)        
     - name: Compress Android Plugin artifacts
       run: |
         readonly dir=$(pwd)
-        (cd capture-plugin/build/repos/releases/io/bitdrift/capture-plugin/${{ inputs.version }} && zip -r "$dir/capture-plugin.zip" ./*)        
+        (cd capture-plugin/build/repos/releases/io/bitdrift/capture-plugin/${{ inputs.version }} && zip -r "$dir/capture-plugin-${{ inputs.version }}.android.zip" ./*)        
     - name: Upload Timber artifacts
       uses: actions/upload-artifact@v4
       with:
         name: capture-timber-${{ inputs.version }}.android.zip
-        path: platform/jvm/capture-timber.zip
+        path: platform/jvm/capture-plugin-${{ inputs.version }}.android.zip
         if-no-files-found: error
     - name: Upload Apollo artifacts
       uses: actions/upload-artifact@v4
       with:
         name: capture-apollo3-${{ inputs.version }}.android.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-${{ inputs.version }}.android.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
@@ -203,19 +203,16 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: capture-timber-${{ inputs.version }}.android.zip
-          path: capture-timber-${{ inputs.version }}.android.zip
       - name: Display structure of Timber downloaded files
         run: ls -R
       - name: Download Android Apollo3 Integration
         uses: actions/download-artifact@v4
         with:
           name: capture-apollo3-${{ inputs.version }}.android.zip
-          path: capture-apollo3-${{ inputs.version }}.android.zip
       - name: Download Android Plugin Integration
         uses: actions/download-artifact@v4
         with:
           name: capture-plugin-${{ inputs.version }}.android.zip
-          path: capture-plugin-${{ inputs.version }}.android.zip
       - name: Prepare Android artifacts
         run: ./ci/gh_prepare_android_artifacts.sh "$VERSION"
         env: