add env var, remove regex quoting

uw-it-aca · Jan 25, 2021 · fbe219a · fbe219a
1 parent 8806fc3
commit fbe219a
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/cicd-deploy/action.yml b/cicd-deploy/action.yml
@@ -217,6 +217,8 @@ runs:
         echo "SUBMITTED $FLUX_PULL_URL"
 
     - name: Merge Flux Pull Request
+      env:
+        GIT_REPO_BRANCH: ${{ inputs.git_repo_branch }}
       shell: bash
       run: |
         echo "::add-mask::${{ inputs.gh_auth_token }}"
@@ -230,7 +232,7 @@ runs:
         EOF
         )
 
-        if [[ ${{ inputs.git_repo_branch }} =~ '^(main|master)$' ]]; then
+        if [[ $GIT_REPO_BRANCH =~ ^(main|master)$ ]]; then
           echo "Visit $FLUX_PULL_URL to merge manifest branch"
         else
           echo "MERGING ${FLUX_PULL_URL}"