Combine tag/version inputs

Author: hsubox76

.github/workflows/e2e-test.yml

@@ -4,13 +4,9 @@ name: E2E Smoke Tests
 on:
   workflow_dispatch:
     inputs:
-      version:
-        description: 'release version'
-        required: false
-        default: 'unknown'
-      tag:
-        description: '@tag to install'
-        required: false
+      versionOrTag:
+        description: 'release version or tag'
+        required: true
         default: 'next'
 
 jobs:
@@ -43,8 +39,8 @@ jobs:
         echo "export const config = $PROJECT_CONFIG; export const testAccount = $TEST_ACCOUNT" > firebase-config.js
     - name: Yarn install
       run: |
-        echo "Installing firebase@${{ github.event.inputs.tag }}"
-        yarn add firebase@${{ github.event.inputs.tag }}
+        echo "Installing firebase@${{ github.event.inputs.versionOrTag }}"
+        yarn add firebase@${{ github.event.inputs.versionOrTag }}
         yarn
     - name: Deploy "callTest" cloud function
       run: |

scripts/ci/notify-test-result.js

@@ -42,10 +42,10 @@ async function notifyTestResults() {
   // Add version if it can find it in the workflow_dispatch event data.
   if (process.env.GITHUB_EVENT_PATH) {
     const wrPayload = require(process.env.GITHUB_EVENT_PATH);
-    if (wrPayload.inputs && wrPayload.inputs.version) {
-      message += ` for release ${wrPayload.inputs.version}.`;
+    if (wrPayload.inputs && wrPayload.inputs.versionOrTag) {
+      message += ` for release ${wrPayload.inputs.versionOrTag}.`;
     } else {
-      console.log(`Couldn't find version in event payload.`);
+      console.log(`Couldn't find versionOrTag in event payload.`);
     }
   } else {
     console.log(`Couldn't find event payload.`);