From 4c5ade26ed4badfad1f0d089e95a2e179b27832b Mon Sep 17 00:00:00 2001 From: Elijah Duffy Date: Mon, 8 Dec 2025 00:03:59 -0800 Subject: [PATCH] php-fpm: hereee we go againnn --- .github/workflows/php-fpm.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/php-fpm.yml b/.github/workflows/php-fpm.yml index 1970fe0..c7f7693 100644 --- a/.github/workflows/php-fpm.yml +++ b/.github/workflows/php-fpm.yml @@ -24,7 +24,7 @@ jobs: lanes: runs-on: ubuntu-latest outputs: - matrix: ${{ steps.set-matrix.outputs.matrix }} + matrix: ${{ steps.set-matrix.outputs.result }} steps: - name: Checkout repository uses: actions/checkout@v4 @@ -49,7 +49,7 @@ jobs: - name: Get changed PHP lanes id: changed-lanes run: | - changed_lanes=$(echo "${{ steps.changed-files.outputs.all_changed_files }}" | tr ' ' '\n' | grep '^php-fpm/' | cut -d'/' -f2 | sort -u | jq -R . | jq -s 'if . == [] then [] else . end') + changed_lanes=$(echo "${{ steps.changed-files.outputs.all_changed_files }}" | tr ' ' '\n' | grep '^php-fpm/' | cut -d'/' -f2 | sort -u | jq -R . | jq -s .) echo "lanes=${changed_lanes:-[]}" >> $GITHUB_OUTPUT shell: bash @@ -69,9 +69,10 @@ jobs: id: set-matrix uses: actions/github-script@v7 with: + result-encoding: json script: | const req_lane = "${{ github.event.inputs.lane }}"; - const build_all = ${{ steps.build-all-check.outputs.build_all }}; + const build_all = ${{ steps.build-all-check.outputs.build_all === 'true' }}; const all_lanes = JSON.parse('${{ steps.get-lanes.outputs.lanes }}'); const changed_lanes = JSON.parse('${{ steps.changed-lanes.outputs.lanes }}'); @@ -90,11 +91,10 @@ jobs: } return { lane: lanes_to_build }; - result-encoding: json build: needs: lanes - if: ${{ needs.lanes.outputs.matrix.lane[0] }} + if: ${{ needs.lanes.outputs.matrix != '' && needs.lanes.outputs.matrix.lane[0] }} runs-on: ubuntu-latest strategy: fail-fast: false