diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6608a94..31fa175 100644 --- 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 index 504f3e0..6c1d890 100644 --- 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 index 7af0dc8..750deca 100644 --- 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 deleted file mode 100644 index 08e00ed..0000000 --- a/test/preprereq +++ /dev/null @@ -1 +0,0 @@ -Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. \ No newline at end of file diff --git a/test/preprereq1 b/test/preprereq1 new file mode 100644 index 0000000..0e26918 --- /dev/null +++ b/test/preprereq1 @@ -0,0 +1 @@ +preprereq1 \ No newline at end of file diff --git a/test/preprereq2 b/test/preprereq2 new file mode 100644 index 0000000..4995b5b --- /dev/null +++ b/test/preprereq2 @@ -0,0 +1 @@ +preprereq2 \ No newline at end of file