reverted to working version

michael-guthrie · Apr 4, 2023 · ef44f0d · ef44f0d
1 parent 8f94bcc
commit ef44f0d
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/.github/workflows/workflow-dispatch.yml b/.github/workflows/workflow-dispatch.yml
@@ -17,19 +17,15 @@ env:
   FRUIT_ABBREVIATION: ${{ github.event.inputs.fruit == 'apple' && 'ap' || github.event.inputs.fruit == 'banana' && 'bn' || 'wm' }}
   CP_FRUIT_SELECTION: ${{ github.event.client_payload.fruit }}
   CP_FRUIT_ABBREVIATION: ${{ github.event.client_payload.fruit == 'apple' && 'ap' || github.event.client_payload.fruit == 'banana' && 'bn' || 'wm' }}
-  # COALESCE_FRUIT_SELECTION: ${{ github.event.client_payload.fruit || github.event.inputs.fruit }}
-  # COALESCE_FRUIT_ABBREVIATION: ${{ (github.event.client_payload.fruit || github.event.inputs.fruit) == 'apple' && 'ap' || (github.event.client_payload.fruit || github.event.inputs.fruit) == 'banana' && 'bn' || 'wm' }}
+  COALESCE_FRUIT_SELECTION: ${{ github.event.client_payload.fruit || github.event.inputs.fruit }}
+  COALESCE_FRUIT_ABBREVIATION: ${{ (github.event.client_payload.fruit || github.event.inputs.fruit) == 'apple' && 'ap' || (github.event.client_payload.fruit || github.event.inputs.fruit) == 'banana' && 'bn' || 'wm' }}
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   # This workflow contains a single job called "build"
   build:
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
-
-    env:
-      COALESCE_FRUIT_SELECTION: ${{ env.FRUIT_SELECTION || env.CP_FRUIT_SELECTION }}
-      COALESCE_FRUIT_ABBREVIATION: ${{ (github.event.client_payload.fruit || github.event.inputs.fruit) == 'apple' && 'ap' || (github.event.client_payload.fruit || github.event.inputs.fruit) == 'banana' && 'bn' || 'wm' }}
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps: