Simplify test yaml

Author: l

.github/workflows/test-sdc-tasks.yml

@@ -8,6 +8,7 @@ on:
       - opened
       - edited
       - reopened
+      - synchronize
 
 jobs:
   test_sdc_tasks:
@@ -24,33 +25,29 @@ jobs:
         id: changed-files
         uses: tj-actions/changed-files@v47.0.5
       - name: test individual shell tools
+        id: test-individual-shell-tools
         if: contains(steps.changed-files.outputs.all_changed_files, 'individual-shell-tools/awk/script-01.sh')
         run: ./test-sdc.sh individual-shell-tools
         shell: bash
       - name: test jq
+        id: test-jq
         if: contains(steps.changed-files.outputs.all_changed_files, 'jq/script-01.sh')
         run: ./test-sdc.sh jq
         shell: bash
       - name: test shell-pipelines
+        id: test-shell-pipelines
         if: contains(steps.changed-files.outputs.all_changed_files, 'shell-pipelines/ls-grep/script-01.sh')
         run: ./test-sdc.sh shell-pipelines
         shell: bash
       - name: make output comment
-        if: contains(steps.changed-files.outputs.all_changed_files, 'individual-shell-tools/awk/script-01.sh') || contains(steps.changed-files.outputs.all_changed_files, 'jq/script-01.sh') || contains(steps.changed-files.outputs.all_changed_files, 'shell-pipelines/ls-grep/script-01.sh')
+        if: steps.test-individual-shell-tools.outputs.attempted == 'y' || steps.test-jq.outputs.attempted == 'y' || steps.test-shell-pipelines.outputs.attempted == 'y'
         env:
           GH_TOKEN: ${{ secrets.MY_TOKEN }}
           ISSUE_URL: ${{ github.event.issue.html_url }}
         run: |
           gh issue comment $ISSUE_URL --body-FILE testoutput.TXT
-      - name: read test output
-        if: contains(steps.changed-files.outputs.all_changed_files, 'individual-shell-tools/awk/script-01.sh') || contains(steps.changed-files.outputs.all_changed_files, 'jq/script-01.sh') || contains(steps.changed-files.outputs.all_changed_files, 'shell-pipelines/ls-grep/script-01.sh')
-        id: read-test-output
-        run: |
-          echo 'testoutput<<EOF' >> $GITHUB_OUTPUT
-          cat testoutput.txt >> $GITHUB_OUTPUT
-          echo EOF >> $GITHUB_OUTPUT
       - name: add appropriate labels
-        if: contains(steps.read-test-output.outputs.testoutput, 'complete!')
+        if: steps.test-individual-shell-tools.outputs.complete == 'y' || steps.test-jq.outputs.complete == 'y' || steps.test-shell-pipelines.outputs.complete == 'y'
         env:
           GH_TOKEN: ${{ secrets.MY_TOKEN }}
           ISSUE_URL: ${{ github.event.issue.html_url }}

test-sdc.sh

@@ -23,7 +23,6 @@ if [[ "$1" == "individual-shell-tools" ]]; then
 			else
 				if [[ "$exercise" == *"stretch"* ]]; then
 					# echo "Stretch task $directory$exercise failing, you can ignore this if you did not attempt. If you didnt, please have the volunteer check this."
-					echo "" >> ../../testoutput.txt
 					total=$(($total-1))
 				else
 					echo "Failed $directory$exercise, please either attempt again or have the volunteer check this." >> ../../testoutput.txt
@@ -35,8 +34,14 @@ if [[ "$1" == "individual-shell-tools" ]]; then
 	cd ..
 	rm test.tmp
 	echo "You passed $pass/$total tasks." >> testoutput.txt
+	if [ -v GITHUB_OUTPUT ]; then
+		echo "attempted=y" >> "$GITHUB_OUTPUT"
+	fi
 	if [ $pass -ge $total ]; then
 		echo "This task is complete!" >> testoutput.txt
+		if [ -v GITHUB_OUTPUT ]; then
+			echo "complete=y" >> "$GITHUB_OUTPUT"
+		fi
 	fi
 	cat testoutput.txt
 elif [[ "$1" == "shell-pipelines" ]]; then
@@ -60,8 +65,14 @@ elif [[ "$1" == "shell-pipelines" ]]; then
 	cd ..
 	rm test.tmp
 	echo "You passed $pass/$total tasks." >> testoutput.txt
+	if [ -v GITHUB_OUTPUT ]; then
+		echo "attempted=y" >> "$GITHUB_OUTPUT"
+	fi
 	if [ $pass -eq $total ]; then
 		echo "This task is complete!" >> testoutput.txt
+		if [ -v GITHUB_OUTPUT ]; then
+			echo "complete=y" >> "$GITHUB_OUTPUT"
+		fi
 	fi
 	cat testoutput.txt
 elif [[ "$1" == "jq" ]]; then
@@ -81,8 +92,14 @@ elif [[ "$1" == "jq" ]]; then
 	cd ..
 	rm test.tmp
 	echo "You passed $pass/$total tasks." >> testoutput.txt
+	if [ -v GITHUB_OUTPUT ]; then
+		echo "attempted=y" >> "$GITHUB_OUTPUT"
+	fi
 	if [ $pass -eq $total ]; then
 		echo "This task is complete!" >> testoutput.txt
+		if [ -v GITHUB_OUTPUT ]; then
+			echo "complete=y" >> "$GITHUB_OUTPUT"
+		fi
 	fi
 	cat testoutput.txt
 else