Fix paratest in GitHub actions

localgovdrupal · Jan 10, 2024 · ab15159 · ab15159
1 parent 18ca7be
commit ab15159
Showing 1 changed file with 5 additions and 19 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -44,10 +44,7 @@ jobs:
       - name: Save git branch and git repo names to env if this is a pull request
         if: github.event_name == 'pull_request'
         run: |
-          echo "GIT_BASE=${GITHUB_BASE_REF}" >> $GITHUB_ENV
-          echo "GIT_BRANCH=${GITHUB_HEAD_REF}" >> $GITHUB_ENV
-          export HEAD="${{ github.event.pull_request.head.label }}"
-          echo "HEAD_USER=${HEAD%%:*}" >> $GITHUB_ENV
+          echo "GIT_BASE=${GITHUB_BASfix/3.x/fix-paratest" >> $GITHUB_ENV
 
       - name: Set composer branch reference for version branches
         if: endsWith(github.ref, '.x')
@@ -106,12 +103,7 @@ jobs:
   phpcs:
     name: Coding standards checks
     needs: build
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        localgov-version:
+    runs-on: ubuntu-latestfix/3.x/fix-paratest
           - '3.x'
         drupal-version:
           - '~10.0'
@@ -161,13 +153,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ./html
-          key: localgov-build-${{ matrix.localgov-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}-${{ github.run_id }}-${{ secrets.CACHE_VERSION }}
-          restore-keys: |
-            localgov-build-${{ matrix.localgov-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}-
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
+          key: localgov-build-${{ matrixfix/3.x/fix-paratest
           php-version: ${{ matrix.php-version }}
 
       - name: Run deprecated code checks
@@ -183,7 +169,7 @@ jobs:
       fail-fast: false
       matrix:
         localgov-version:
-          - '3.x'
+          - '3.x'fix/3.x/fix-paratest
         drupal-version:
           - '~10.0'
         php-version:
@@ -214,4 +200,4 @@ jobs:
           mkdir -p ./html/web/sites/simpletest && chmod 777 ./html/web/sites/simpletest
           sed -i "s#http://localgov.lndo.site#http://drupal#" ./html/phpunit.xml.dist
           docker exec -t drupal bash -c 'chown docker:docker -R /var/www/html'
-          docker exec -u docker -t drupal bash -c "cd /var/www/html && ./bin/paratest --processes=4 ${{ env.LOCALGOV_DRUPAL_PROJECT_PATH }}"
+          docker exec -u docker -t drupal bash -c "cd /var/www/html && ./bin/paratest --processes=4 /var/www/html/${{ env.LOCALGOV_DRUPAL_PROJECT_PATH }}"