Merge pull request #25 from libon/improve-release-drafter-tag

🤓
libon · Aug 20, 2020 · 3e82aff · 3e82aff
2 parents 903d3b5 + 2e4848a
commit 3e82aff
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
@@ -17,12 +17,12 @@ jobs:
         run: |
          # extract the version name from our build file
          echo ::set-env name=VERSION::$(grep versionName $GITHUB_WORKSPACE/app/build.gradle |sed -e 's/^.*versionName "//g;s/"//g')
-         # if this workflow was launched from a tag, use that tag, otherwise use the version name for the tag
-         echo ::set-env name=TAG::$(if [[ $GITHUB_REF == refs/tags/* ]]; then echo $GITHUB_REF | sed -e  "s/refs.tags.//g"; else echo $VERSION; fi)
+         # if this workflow was launched from a tag, use that tag, otherwise leave the tag blank
+         echo ::set-env name=TAG::$([[ $GITHUB_REF == refs/tags/* ]] && echo $GITHUB_REF | sed -e  "s/refs.tags.//g")
       # Drafts your next Release notes as Pull Requests are merged into "master"
       - uses: release-drafter/release-drafter@v5
         with:
-          tag: v${{ env.TAG}}
+          tag: ${{ env.TAG}}
           name: v${{ env.VERSION }}
           version: v${{ env.VERSION }}
           publish: ${{ startsWith(github.ref, 'refs/tags') }}

diff --git a/app/build.gradle b/app/build.gradle
@@ -7,7 +7,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 28
         versionCode 1
-        versionName "1.3.1"
+        versionName "1.3.2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {