From 5579817f9f5661e63fe52b8e18c47319a2714fa7 Mon Sep 17 00:00:00 2001
From: Joseph Flinn <58369717+joseph-flinn@users.noreply.github.com>
Date: Mon, 13 Jun 2022 12:58:19 -0700
Subject: [PATCH] Updating the release version check to use the new action
 (#1934)

* Updating the release version check to use the new action

* Update .github/workflows/release.yml

Co-authored-by: Vince Grassia <593223+vgrassia@users.noreply.github.com>

Co-authored-by: Vince Grassia <593223+vgrassia@users.noreply.github.com>
---
 .github/workflows/release.yml | 34 +++++++++-------------------------
 1 file changed, 9 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 631d08a25..8e28ba9a8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -34,29 +34,13 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579  # v2.4.0
 
-      - name: Retrieve Mobile release version
-        id: retrieve-mobile-version
-        run: |
-          ver=$(sed -E -n '/^<manifest/s/^.*[ ]android:versionName="([^"]+)".*$/\1/p' \
-          ./src/Android/Properties/AndroidManifest.xml | tr -d '"')
-          echo "::set-output name=mobile_version::${ver}"
-        shell: bash
-
-      - name: Check to make sure Mobile release version has been bumped
-        if: ${{ github.event.inputs.release_type == 'Initial Release' }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          latest_ver=$(hub release -L 1 -f '%T')
-          latest_ver=${latest_ver:1}
-          echo "Latest version: $latest_ver"
-          ver=${{ steps.retrieve-mobile-version.outputs.mobile_version }}
-          echo "Version: $ver"
-          if [ "$latest_ver" = "$ver" ]; then
-            echo "Version has not been bumped!"
-            exit 1
-          fi
-        shell: bash
+      - name: Check Release Version
+        id: version
+        uses: bitwarden/gh-actions/release-version-check@8f055ef543c7433c967a1b9b04a0f230923233bb
+        with:
+          release-type: ${{ github.event.inputs.release_type }}
+          project-type: xamarin
+          file: src/Android/Properties/AndroidManifest.xml
 
       - name: Get branch name
         id: branch
@@ -83,8 +67,8 @@ jobs:
                       ./com.x8bit.bitwarden-fdroid.apk/com.x8bit.bitwarden-fdroid.apk,
                       ./Bitwarden iOS.zip"
           commit: ${{ github.sha }}
-          tag: v${{ steps.retrieve-mobile-version.outputs.mobile_version }}
-          name: Version ${{ steps.retrieve-mobile-version.outputs.mobile_version }}
+          tag: v${{ steps.version.outputs.version }}
+          name: Version ${{ steps.version.outputs.version }}
           body: "<insert release notes here>"
           token: ${{ secrets.GITHUB_TOKEN }}
           draft: true