change directory structure of workflow artifacts (#406)

* change directory structure of workflow artefacts * Apply suggestions from code review to please Max's OCD :P Co-authored-by: Max Rumpf <[email protected]> Co-authored-by: Max Rumpf <[email protected]>
jellyfin · May 27, 2021 · 6a6307d · 6a6307d
1 parent 0901083
commit 6a6307d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/.github/workflows/app-build.yaml b/.github/workflows/app-build.yaml
@@ -30,9 +30,9 @@ jobs:
         run: ./gradlew --no-daemon --info assembleDebug
       - name: Split APK release types
         run: |
-          mkdir -p build/jellyfin-publish/release-libre build/jellyfin-publish/release-proprietary;
-          mv app/build/outputs/apk/*/*/jellyfin-android-*-libre-debug.apk build/jellyfin-publish/release-libre/;
-          mv app/build/outputs/apk/*/*/jellyfin-android-*-proprietary-debug.apk build/jellyfin-publish/release-proprietary/;
+          mkdir -p build/jellyfin-publish
+          mv app/build/outputs/apk/*/*/jellyfin-android-*-libre-debug.apk build/jellyfin-publish/
+          mv app/build/outputs/apk/*/*/jellyfin-android-*-proprietary-debug.apk build/jellyfin-publish/
       - uses: actions/upload-artifact@v2
         with:
           name: build-artifacts

diff --git a/.github/workflows/app-publish.yaml b/.github/workflows/app-publish.yaml
@@ -28,24 +28,21 @@ jobs:
         run: ./gradlew --no-daemon --info assembleRelease versionTxt
       - name: Split APK release types
         run: |
-          mkdir -p build/jellyfin-publish/release-libre build/jellyfin-publish/release-proprietary;
-          mv app/build/outputs/apk/*/*/jellyfin-android-*-libre-release.apk build/jellyfin-publish/release-libre/;
-          mv app/build/outputs/apk/*/*/jellyfin-android-*-proprietary-release.apk build/jellyfin-publish/release-proprietary/;
-          mv app/build/version.txt build/jellyfin-publish/;
+          mkdir -p build/jellyfin-publish
+          mv app/build/outputs/apk/*/*/jellyfin-android-*-libre-release.apk build/jellyfin-publish/
+          mv app/build/outputs/apk/*/*/jellyfin-android-*-proprietary-release.apk build/jellyfin-publish/
+          mv app/build/version.txt build/jellyfin-publish/
       - name: Upload release artifacts
         uses: alexellis/[email protected]
         env:
           GITHUB_TOKEN: ${{ github.token }}
         with:
-          asset_paths: |
-            ["build/jellyfin-publish/release-libre/*",
-            "build/jellyfin-publish/release-proprietary/*",
-            "build/jellyfin-publish/version.txt"]
+          asset_paths: '["build/jellyfin-publish/*"]'
       - name: Upload to repo.jellyfin.org
         uses: burnett01/[email protected]
         with:
           switches: -vrptz
-          path: build/jellyfin-publish/**/
+          path: build/jellyfin-publish/
           remote_path: /srv/repository/releases/client/android/versions/v${{ env.JELLYFIN_VERSION }}
           remote_host: ${{ secrets.DEPLOY_HOST }}
           remote_user: ${{ secrets.DEPLOY_USER }}