From 3055726fb3442458cac4653115c50f4a8d468767 Mon Sep 17 00:00:00 2001
From: austinried <4966622+austinried@users.noreply.github.com>
Date: Tue, 24 Aug 2021 15:31:22 +0900
Subject: [PATCH] better name/group artifacts

---
 .github/workflows/build-release-debugsign.yml |  9 +++++++--
 .github/workflows/build-release.yml           | 19 +++++++++++++------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build-release-debugsign.yml b/.github/workflows/build-release-debugsign.yml
index 424ce4b..77af5cf 100644
--- a/.github/workflows/build-release-debugsign.yml
+++ b/.github/workflows/build-release-debugsign.yml
@@ -28,7 +28,12 @@ jobs:
           configuration-cache-enabled: true
           build-root-directory: android
           arguments: assembleRelease -PsignReleaseWithDebug=true
+      - run: |
+          mkdir bin
+      - run: >
+          mv android/app/build/outputs/apk/release/app-release.apk
+          bin/subtracks-${GITHUB_SHA}.apk
       - uses: actions/upload-artifact@v2
         with:
-          name: app-release.apk
-          path: android/app/build/outputs/apk/release/app-release.apk
+          name: subtracks-testing
+          path: bin/*
diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
index c831b97..35cd580 100644
--- a/.github/workflows/build-release.yml
+++ b/.github/workflows/build-release.yml
@@ -14,6 +14,9 @@ jobs:
         with:
           node-version: '14'
           cache: 'yarn'
+      - name: Get subtracks version
+        run: |
+          echo "SUBTRACKS_VERSION=$(node -e "console.log(require('./package.json').version);")" >> $GITHUB_ENV
       - run: |
           yarn
       - uses: gradle/wrapper-validation-action@v1
@@ -33,10 +36,11 @@ jobs:
           -PSUBTRACKS_UPLOAD_KEY_ALIAS=subtracks
           -PSUBTRACKS_UPLOAD_KEY_PASSWORD="$SUBTRACKS_UPLOAD_KEY_PASSWORD"
           -PSUBTRACKS_UPLOAD_STORE_PASSWORD="$SUBTRACKS_UPLOAD_STORE_PASSWORD"
-      - uses: actions/upload-artifact@v2
-        with:
-          name: app-release.apk
-          path: android/app/build/outputs/apk/release/app-release.apk
+      - run: |
+          mkdir bin
+      - run: >
+          mv android/app/build/outputs/apk/release/app-release.apk
+          bin/subtracks-${SUBTRACKS_VERSION}.apk
       - name: Build release AAB
         env:
           SUBTRACKS_UPLOAD_KEY_PASSWORD: ${{ secrets.SUBTRACKS_UPLOAD_KEY_PASSWORD }}
@@ -48,7 +52,10 @@ jobs:
           -PSUBTRACKS_UPLOAD_KEY_ALIAS=subtracks
           -PSUBTRACKS_UPLOAD_KEY_PASSWORD="$SUBTRACKS_UPLOAD_KEY_PASSWORD"
           -PSUBTRACKS_UPLOAD_STORE_PASSWORD="$SUBTRACKS_UPLOAD_STORE_PASSWORD"
+      - run: >
+          mv android/app/build/outputs/bundle/release/app-release.aab
+          bin/subtracks-${SUBTRACKS_VERSION}.aab
       - uses: actions/upload-artifact@v2
         with:
-          name: app-release.aab
-          path: android/app/build/outputs/bundle/release/app-release.aab
+          name: subtracks-release
+          path: bin/*