Fix multiline prerequisites output

colluca · Sep 7, 2024 · b167db4 · b167db4
1 parent e0e816f
commit b167db4
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -31,5 +31,5 @@ jobs:
         flags: --recursive
     - name: Check recursive prerequisites
       run: |
-        test "${{ steps.recursive-prerequisites.outputs.prerequisites }}" = "preprereq"
+        test "${{ steps.recursive-prerequisites.outputs.prerequisites }}" = "preprereq1 preprereq2"
         echo ${{ steps.recursive-prerequisites.outputs.hash }}
diff --git a/action.yml b/action.yml
@@ -35,6 +35,6 @@ runs:
       working-directory: ${{ inputs.working-directory }}
       run: |
         hash=$(${GITHUB_ACTION_PATH}/list-make-prerequisites.py ${{ inputs.target }} ${{ inputs.flags }} --hash 2>/dev/null)
-        prerequisites=$(${GITHUB_ACTION_PATH}/list-make-prerequisites.py ${{ inputs.target }} ${{ inputs.flags }} 2>/dev/null)
+        prerequisites=$(${GITHUB_ACTION_PATH}/list-make-prerequisites.py ${{ inputs.target }} ${{ inputs.flags }} 2>/dev/null | xargs)
         echo "hash=$hash" >> $GITHUB_OUTPUT
         echo "prerequisites=$prerequisites" >> $GITHUB_OUTPUT
diff --git a/test/Makefile b/test/Makefile
@@ -1,5 +1,6 @@
 test: prereq
 	cp $< $@
 
-prereq: preprereq
+prereq: preprereq1 preprereq2
 	cp $< $@
+	cat preprereq2 >> $@
diff --git a/test/preprereq b/test/preprereq
diff --git a/test/preprereq1 b/test/preprereq1
@@ -0,0 +1 @@
+preprereq1
diff --git a/test/preprereq2 b/test/preprereq2
@@ -0,0 +1 @@
+preprereq2