CPS-393: Support for multiple CiviCRN versions

compucorp · Jan 20, 2021 · 7bfc94f · 7bfc94f
1 parent f937052
commit 7bfc94f
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/.github/workflows/backstop.yml b/.github/workflows/backstop.yml
@@ -62,7 +62,6 @@ jobs:
           civibuild create drupal-clean --civi-ver ${{ github.event.inputs.test_civicrm_version }} --cms-ver 7.74 --web-root $GITHUB_WORKSPACE/${{ env.TEST_SITE_FOLDER }} --url ${{ env.TEST_SITE_URL }}
           chmod -R 777 $GITHUB_WORKSPACE/${{ env.TEST_SITE_FOLDER }}
       - name: Install BackstopJS
-        working-directory: $GITHUB_WORKSPACE
         run: |
           git clone https://github.com/compucorp/backstopjs-config.git --branch CPS-393-support-for-different-civicrm-versions
           cd ${{ env.BACKSTOP_DIR }}
@@ -87,7 +86,7 @@ jobs:
           drush sql-query "UPDATE block SET status = 0 WHERE theme='shoreditch_companion_d7_theme' AND module='system' AND delta IN ('navigation', 'powered-by');" -y
           drush cc all && drush cc civicrm
       - name: Setup data and site-config.json for Reference Backstop Screenshots
-        working-directory: $GITHUB_WORKSPACE/${{ env.BACKSTOP_DIR }}/backstop_data
+        working-directory: ${{ env.BACKSTOP_DIR }}/backstop_data
         run: |
           cp site-config.json.sample site-config.json
           sed -i 's+<url>+${{ env.REFERENCE_SITE_URL }}+' site-config.json
@@ -96,7 +95,7 @@ jobs:
           npx gulp backstopjs:setup-data
       - name: Reference Screenshots in ${{ github.event.inputs.reference_shoreditch_branch }} Branch/Tag
         continue-on-error: true
-        working-directory: $GITHUB_WORKSPACE/${{ env.BACKSTOP_DIR }}
+        working-directory: ${{ env.BACKSTOP_DIR }}
         run: |
           npx gulp backstopjs:reference
 
@@ -119,21 +118,21 @@ jobs:
           drush sql-query "UPDATE block SET status = 0 WHERE theme='shoreditch_companion_d7_theme' AND module='system' AND delta IN ('navigation', 'powered-by');" -y
           drush cc all && drush cc civicrm
       - name: Setup data and site-config.json for Test Backstop Screenshots
-        working-directory: $GITHUB_WORKSPACE/${{ env.BACKSTOP_DIR }}/backstop_data
+        working-directory: ${{ env.BACKSTOP_DIR }}/backstop_data
         run: |
           sed -i 's+<url>+${{ env.TEST_SITE_URL }}+' site-config.json
           sed -i 's+<path-to-site-root>+'"$GITHUB_WORKSPACE"'/${{ env.TEST_SITE_FOLDER }}/web+' site-config.json
           cd ..
           npx gulp backstopjs:setup-data
       - name: Test Screenshots in ${{ github.event.inputs.test_shoreditch_branch }} Branch/Tag
-        working-directory: $GITHUB_WORKSPACE/${{ env.BACKSTOP_DIR }}
+        working-directory: ${{ env.BACKSTOP_DIR }}
         continue-on-error: true
         run: |
           npx gulp backstopjs:test
 
       - name: Prepare test report for download
         if: ${{ always() }}
-        working-directory: $GITHUB_WORKSPACE/${{ env.BACKSTOP_DIR }}/backstop_data
+        working-directory: ${{ env.BACKSTOP_DIR }}/backstop_data
         run: |
           mkdir backstop_report
           cp -r html_report backstop_report