Merge branch 'master' of github.com:TheRolfFR/optymoNextAndroid

TheRolfFR · Aug 31, 2021 · 4181839 · 4181839
2 parents f40c6b3 + d88cb75
commit 4181839
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -19,8 +19,8 @@ jobs:
     steps:
 
       - name: Checkout
-        uses: actions/checkout@v2
-
+        uses: actions/checkout@v2.3.3
+      - run: git fetch --prune --unshallow
       - name: Restore Cache
         uses: actions/cache@v2
         with:
@@ -30,22 +30,25 @@ jobs:
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
+      - name: 'Get Previous tag'
+        id: previoustag
+        uses: "WyriHaximus/github-action-get-previous-tag@v1"
       - name: Assemble Debug
         run: ./gradlew assembleDebug
 
       - name: Upload APK
         uses: actions/upload-artifact@v2
         with:
-          name: OptymoNext_${{ github.event.inputs.version || github.ref }}
+          name: OptymoNext_${{ github.event.inputs.version || steps.previoustag.outputs.tag }}
           path: app/build/outputs/apk/debug/**.apk
       - name: Create Release
         id: create_release
         uses: actions/create-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          tag_name: ${{ github.event.inputs.version || github.ref }}
-          release_name: ${{ github.event.inputs.version || github.ref }}
+          tag_name: ${{ github.event.inputs.version || steps.previoustag.outputs.tag }}
+          release_name: ${{ github.event.inputs.version || steps.previoustag.outputs.tag }}
           draft: false
           prerelease: false
       - name: Upload Release Asset
@@ -56,5 +59,5 @@ jobs:
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
           asset_path: app/build/outputs/apk/debug/app-debug.apk
-          asset_name: OptymoNext_${{ github.event.inputs.version || github.ref }}.apk
-          asset_content_type: application/vnd.android.package-archive
+          asset_name: OptymoNext_${{ github.event.inputs.version || steps.previoustag.outputs.tag }}.apk
+          asset_content_type: application/vnd.android.package-archive