Merge branch 'main' into LayZeeDK/refactor/escape-input-to-prevent-sc…

…ript-injection
nrwl · Sep 1, 2022 · 2a277ec · 2a277ec
2 parents 28224f5 + eae3c65
commit 2a277ec
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -108,7 +108,7 @@ jobs:
     name: My Job
     permissions:
       contents: 'read'
-      actions: 'write'
+      actions: 'read'
 ```
 
 ## Background

diff --git a/action.yml b/action.yml
@@ -53,13 +53,11 @@ runs:
 
     - name: Optionally set the derived SHAs as NX_BASE and NX_HEAD environment variables for the current job
       shell: bash
+      if: ${{ inputs.set-environment-variables-for-job == 'true' }}
       run: |
-        # Built-in Github action conditionals are not supported in composite steps so have to check manually in bash
-        if [ "${{ inputs.set-environment-variables-for-job }}" = "true" ]; then
-          echo "NX_BASE=${{ steps.setSHAs.outputs.base }}" >> $GITHUB_ENV
-          echo "NX_HEAD=${{ steps.setSHAs.outputs.head }}" >> $GITHUB_ENV
-          echo "NX_BASE and NX_HEAD environment variables have been set for the current Job"
-        fi
+        echo "NX_BASE=${{ steps.setSHAs.outputs.base }}" >> $GITHUB_ENV
+        echo "NX_HEAD=${{ steps.setSHAs.outputs.head }}" >> $GITHUB_ENV
+        echo "NX_BASE and NX_HEAD environment variables have been set for the current Job"
 branding:
   icon: "terminal"
   color: "blue"