fix: fixes Compile assets not respecting package manager when using n…

…pm (#90) * fix: fixes Compile assets not respecting package manager when using npm * chore: remove unnecessary env var * chore: fix non working syntax
inpsyde · Nov 28, 2023 · 20e66aa · 20e66aa
1 parent 8eac3b4
commit 20e66aa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.github/workflows/build-and-push-assets.yml b/.github/workflows/build-and-push-assets.yml
@@ -82,7 +82,6 @@ jobs:
       TAG_NAME: ''                                     # we'll override if the push is for tag
       TAG_BRANCH_NAME: ''                              # we'll override if the push is for tag
       LOCK_FILE: ''                                    # we'll override after checking files
-      PACKAGE_MANAGER: 'yarn'                          # we'll override based on env/inputs
       NO_CHANGES: ''                                   # we'll override if no changes to commit
     steps:
       - name: Checkout
@@ -167,7 +166,7 @@ jobs:
         run: ${{ format('{0} {1}', inputs.PACKAGE_MANAGER, env.ARGS) }}
 
       - name: Compile assets
-        run: ${{ ((env.PACKAGE_MANAGER == 'yarn') && 'yarn') || 'npm run' }} ${{ env.COMPILE_SCRIPT }}
+        run: ${{ inputs.PACKAGE_MANAGER == 'yarn' && 'yarn' || 'npm run' }} ${{ env.COMPILE_SCRIPT }}
 
       - name: Git add, commit, push
         run: |

diff --git a/.github/workflows/tests-unit-js.yml b/.github/workflows/tests-unit-js.yml
@@ -89,7 +89,7 @@ jobs:
           cache: ${{ inputs.PACKAGE_MANAGER }}
 
       - name: Install dependencies
-        run: ${{ ((inputs.PACKAGE_MANAGER == 'yarn') && 'yarn') || 'npm install' }}
+        run: ${{ inputs.PACKAGE_MANAGER == 'yarn' && 'yarn' || 'npm install' }}
 
       - name: Run Jest
         run: ./node_modules/.bin/jest ${{ inputs.JEST_ARGS }}