wip: use inputs and shorten fixture vars

dgrebb · Jan 16, 2024 · df64663 · df64663
1 parent 424d314
commit df64663
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.github/actions/sanity-test-checks/action.yml b/.github/actions/sanity-test-checks/action.yml
@@ -64,7 +64,7 @@ runs:
       working-directory: ${{ inputs.WORKSPACE_ROOT }}
       run: |
         set +e
-        FULL_TEST_DIFF=$(diff <(jq -S '.tests[]' test/__fixtures__/${{ inputs.FIXTURE }}.json) <(jq -S '.tests[]' test/configs/backstop_data/bitmaps_test/**/report.json))
+        FULL_TEST_DIFF=$(diff <(jq -S '.tests[]' $FIXTURE) <(jq -S '.tests[]' test/configs/backstop_data/bitmaps_test/**/report.json))
         echo "## Unfiltered Diff" >> $GITHUB_STEP_SUMMARY
         echo "<details>" >> $GITHUB_STEP_SUMMARY
         echo "<summary>Expand Diff</summary>" >> $GITHUB_STEP_SUMMARY
@@ -77,7 +77,7 @@ runs:
 
     - name: "Report Validation Outcome"
       shell: bash
-      working-directory: ${{ steps.base.outputs.WORKSPACE_ROOT }}
+      working-directory: ${{ inputs.WORKSPACE_ROOT }}
       run: |
         if [[ "$TEST_RESULT" != "" ]]; then
           exit 1

diff --git a/.github/actions/smoke-test-checks/action.yml b/.github/actions/smoke-test-checks/action.yml
@@ -19,7 +19,7 @@ runs:
       id: validate
       continue-on-error: true
       shell: bash
-      working-directory: ${{ steps.base.outputs.WORKSPACE_ROOT }}
+      working-directory: ${{ inputs.WORKSPACE_ROOT }}
       run: |
         set +e
         FIXTURE="test/__fixtures__/${{ inputs.FIXTURE }}"
@@ -68,10 +68,10 @@ runs:
       id: diff
       continue-on-error: true
       shell: bash
-      working-directory: ${{ steps.base.outputs.WORKSPACE_ROOT }}
+      working-directory: ${{ inputs.WORKSPACE_ROOT }}
       run: |
         set +e
-        FULL_TEST_DIFF=$(diff <(jq -S '.tests[]' test/__fixtures__/${{ inputs.FIXTURE }}) <(jq -S '.tests[]' test/configs/backstop_data/bitmaps_test/**/report.json))
+        FULL_TEST_DIFF=$(diff <(jq -S '.tests[]' $FIXTURE) <(jq -S '.tests[]' test/configs/backstop_data/bitmaps_test/**/report.json))
         echo "## Unfiltered Diff" >> $GITHUB_STEP_SUMMARY
         echo "<details>" >> $GITHUB_STEP_SUMMARY
         echo "<summary>Expand Diff</summary>" >> $GITHUB_STEP_SUMMARY
@@ -84,7 +84,7 @@ runs:
 
     - name: "Report Validation Outcome"
       shell: bash
-      working-directory: ${{ steps.base.outputs.WORKSPACE_ROOT }}
+      working-directory: ${{ inputs.WORKSPACE_ROOT }}
       run: |
         if [[ "$TEST_RESULT" != "" ]]; then
           exit 1