From dd1adbc19692ebdb1ae3b0b0a76d631378e9e74e Mon Sep 17 00:00:00 2001 From: Eric Schultz Date: Mon, 22 Apr 2024 11:23:21 -0500 Subject: [PATCH] Add better conditionality on node and ruby installs --- .github/actions/after-checkout-prep/action.yml | 4 ++-- .github/workflows/cache-packages.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/actions/after-checkout-prep/action.yml b/.github/actions/after-checkout-prep/action.yml index dd2f68286..45495d538 100644 --- a/.github/actions/after-checkout-prep/action.yml +++ b/.github/actions/after-checkout-prep/action.yml @@ -16,12 +16,12 @@ runs: postgres_password: password - name: "Install NPM packages" uses: "./.github/actions/install-packages" - if: ${{ inputs.node != '' }} + if: ${{ inputs.node && inputs.node != '' }} with: node: ${{ inputs.node }} - name: "Install Ruby packages" uses: "./.github/actions/install-packages" - if: ${{ inputs.ruby != '' }} + if: ${{ inputs.ruby && inputs.ruby != '' }} with: ruby: ${{ inputs.ruby }} diff --git a/.github/workflows/cache-packages.yml b/.github/workflows/cache-packages.yml index b3cfbcc32..2564daa53 100644 --- a/.github/workflows/cache-packages.yml +++ b/.github/workflows/cache-packages.yml @@ -13,7 +13,7 @@ jobs: npm-package-download: name: Download NPM packages runs-on: ${{ inputs.os }} - if: ${{ inputs.node != '' }} + if: ${{ inputs.node && inputs.node != '' }} steps: - uses: actions/checkout@v4 - uses: ./.github/actions/install-packages @@ -22,7 +22,7 @@ jobs: ruby-package-download: name: Download Ruby packages runs-on: ${{ inputs.os }} - if: ${{ inputs.ruby != '' }} + if: ${{ inputs.ruby && inputs.ruby != '' }} steps: - uses: actions/checkout@v4 - uses: ./.github/actions/install-packages