fix final step to run on dry run

Co-authored-by: Andy Pixley <3723676+pixman20@users.noreply.github.com>

.github/workflows/publish-github-release-bwa.yml

@@ -3,7 +3,7 @@ name: Publish Password Manager and Authenticator GitHub Release as newest
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 3 * * 1-5'
+    - cron: '0 * * * 1-5' # Every hour on the hour on weekdays
 
 permissions:
   contents: write
@@ -11,24 +11,12 @@ permissions:
   actions: read
 
 jobs:
-  publish-release-password-manager:
-    name: Publish Password Manager Release
-    uses: bitwarden/gh-actions/.github/workflows/_publish-mobile-github-release.yml@main
-    with:
-      release_name: "Password Manager"
-      workflow_name: "publish-github-release.yml"
-      credentials_filename: "play_creds.json"
-      project_type: android
-      check_release_command: >
-        bundle exec fastlane getLatestPlayStoreVersion package_name:com.x8bit.bitwarden track:production
-    secrets: inherit
-
   publish-release-authenticator:
     name: Publish Authenticator Release
-    uses: bitwarden/gh-actions/.github/workflows/_publish-mobile-github-release.yml@main
+    uses: bitwarden/gh-actions/.github/workflows/_publish-mobile-github-release.yml@agalles/test-1118
     with:
       release_name: "Authenticator"
-      workflow_name: "publish-github-release.yml"
+      workflow_name: "publish-github-release-bwa.yml"
       credentials_filename: "authenticator_play_store-creds.json"
       project_type: android
       check_release_command: >

.github/workflows/publish-github-release-bwpm.yml

@@ -0,0 +1,24 @@
+name: Publish Password Manager and Authenticator GitHub Release as newest
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 * * * 1-5' # Every hour on the hour on weekdays
+
+permissions:
+  contents: write
+  id-token: write
+  actions: read
+
+jobs:
+  publish-release-password-manager:
+    name: Publish Password Manager Release
+    uses: bitwarden/gh-actions/.github/workflows/_publish-mobile-github-release.yml@agalles/test-1118
+    with:
+      release_name: "Password Manager"
+      workflow_name: "publish-github-release-bwpm.yml"
+      credentials_filename: "play_creds.json"
+      project_type: android
+      check_release_command: >
+        bundle exec fastlane getLatestPlayStoreVersion package_name:com.x8bit.bitwarden track:production
+    secrets: inherit

.github/workflows/publish-store.yml

@@ -1,5 +1,6 @@
 name: Publish to Google Play
-run-name: "Promoting ${{ inputs.product }} ${{ inputs.version-code }} from ${{ inputs.track-from }} to ${{ inputs.track-target }}"
+run-name:  >
+  ${{ inputs.dry-run && ' (Dry Run)' || '' }}Promoting ${{ inputs.product }} ${{ inputs.version-code }} from ${{ inputs.track-from }} to ${{ inputs.track-target }}
 on:
   workflow_dispatch:
     inputs:
@@ -46,6 +47,10 @@ on:
           - production
           - Fastlane Automation Target
         required: true
+      dry-run:
+        description: "Dry-Run, Run the workflow without publishing to the store"
+        type: boolean
+        default: false
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   GITHUB_ACTION_RUN_URL: "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
@@ -54,6 +59,7 @@ permissions:
   contents: read
   packages: read
   id-token: write
+  actions: write
 
 jobs:
     promote:
@@ -122,6 +128,8 @@ jobs:
             echo "$FORMATTED_MESSAGE" >> $GITHUB_ENV
             echo "EOF" >> $GITHUB_ENV
         - name: Promote Play Store version to production
+          if: ${{ inputs.dry-run == false }}
+          id: publish
           env:
             PLAY_KEYSTORE_PASSWORD: ${{ steps.get-kv-secrets.outputs.PLAY-BETA-KEYSTORE-PASSWORD }}
             PLAY_KEY_PASSWORD: ${{ steps.get-kv-secrets.outputs.PLAY-BETA-KEY-PASSWORD }}
@@ -158,3 +166,19 @@ jobs:
               releaseNotes:"$RELEASE_NOTES" \
               track:"$TRACK_FROM" \
               trackPromoteTo:"$TRACK_TARGET"
+
+        - name: Enable Publish Github Release Workflow
+          if: ${{ steps.publish.conclusion == 'success' || inputs.dry-run }}
+          env:
+            PRODUCT: ${{ inputs.product }}
+            DRY_RUN: ${{ inputs.dry-run }}
+          run: |
+            if $DRY_RUN ; then
+              gh workflow view publish-github-release.yml
+              exit 0
+            fi
+            if [ "$PRODUCT" = "Password Manager" ]; then
+              gh workflow enable publish-github-release-bwpm.yml
+            elif [ "$PRODUCT" = "Authenticator" ]; then
+              gh workflow enable publish-github-release-bwa.yml
+            fi