Merge pull request #65 from localgovdrupal/2.x

Pull request to review changes ahead of 2.0.5 release to fix tests.

Author: finnlewis

.github/workflows/test.yml

@@ -37,7 +37,7 @@ jobs:
           echo "GIT_BASE=${GITHUB_BASE_REF}" >> $GITHUB_ENV
           echo "GIT_BRANCH=${GITHUB_HEAD_REF}" >> $GITHUB_ENV
           echo "GIT_REPO=${{ github.event.pull_request.head.repo.full_name }}" >> $GITHUB_ENV
-          
+
       - name: Set composer branch reference for version branches
         if: endsWith(github.ref, '.x')
         run: echo "COMPOSER_REF=${GIT_BRANCH}-dev" >> $GITHUB_ENV
@@ -46,6 +46,12 @@ jobs:
         if: endsWith(github.ref, '.x') == false
         run: echo "COMPOSER_REF=dev-${GIT_BRANCH}" >> $GITHUB_ENV
 
+      - name: Get the latest tagged release for branch version
+        run: |
+          LATEST_RELEASE=$(curl -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/${GITHUB_REPOSITORY}/git/matching-refs/tags/${GIT_BASE%'.x'} | grep -Po '(?<=refs/tags/)[^"]+' | tail -1)
+          if [ -z $LATEST_RELEASE ]; then LATEST_RELEASE=1; fi
+          echo "LATEST_RELEASE=${LATEST_RELEASE}" >> $GITHUB_ENV
+
       - name: Cached workspace
         uses: actions/cache@v2
         with:
@@ -66,16 +72,15 @@ jobs:
       - name: Create LocalGov Drupal project
         run: |
           composer create-project --stability dev --no-install localgovdrupal/localgov-project ./html "${{ matrix.localgov-version }}"
-          composer require --no-install drupal/core-recommended:${{ matrix.drupal-version }} drupal/core-composer-scaffold:${{ matrix.drupal-version }} drupal/core-project-message:${{ matrix.drupal-version }} drupal/core-dev:${{ matrix.drupal-version }}
-          composer install
+          composer --working-dir=./html require --no-install localgovdrupal/localgov:${{ matrix.localgov-version }}-dev
+          composer --working-dir=./html require --no-install drupal/core-recommended:${{ matrix.drupal-version }} drupal/core-composer-scaffold:${{ matrix.drupal-version }} drupal/core-project-message:${{ matrix.drupal-version }} drupal/core-dev:${{ matrix.drupal-version }}
+          composer --working-dir=./html install
 
-      - name: Setup package source and authentication for the test target
+      - name: Obtain the test target from the repo that triggered this workflow
         run: |
           composer --working-dir=html config repositories.1 vcs [email protected]:${GIT_REPO}.git
           composer global config github-oauth.github.com ${{ github.token }}
-
-      - name: Obtain the test target from the repo that triggered this workflow
-        run: composer --working-dir=html require --with-all-dependencies localgovdrupal/${{ github.event.repository.name }}:"${COMPOSER_REF} as ${GIT_BASE%'.x'}"
+          composer --working-dir=./html require --with-all-dependencies localgovdrupal/${{ github.event.repository.name }}:"${COMPOSER_REF} as ${LATEST_RELEASE}"
 
   phpcs:
     name: Coding standards checks
@@ -158,11 +163,11 @@ jobs:
 
     steps:
 
-      - name: Clone drupal_container
+      - name: Clone Drupal container
         uses: actions/checkout@v2
         with:
           repository: localgovdrupal/drupal-container
-          ref: master
+          ref: php${{ matrix.php-version }}
 
       - name: Cached workspace
         uses: actions/cache@v2
@@ -178,7 +183,5 @@ jobs:
       - name: Run PHPUnit tests
         run: |
           mkdir -p ./html/web/sites/simpletest && chmod 777 ./html/web/sites/simpletest
-          sed -i "s#http://localgov.lndo.site#http://drupal#; s#mysql://database:database@database/database#sqlite://localhost//dev/shm/test.sqlite#" ./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/phpunit --testdox"
           docker exec -u docker -t drupal bash -c "cd /var/www/html && ./bin/paratest --processes=4"

config/optional/block.block.localgov_subsite_navigation_base.yml

@@ -16,4 +16,6 @@ settings:
   label: 'Subsite navigation'
   provider: localgov_subsites
   label_display: '0'
+  context_mapping:
+    node: '@node.node_route_context:node'
 visibility: {  }

config/optional/block.block.localgov_subsite_navigation_scarfolk.yml

@@ -16,4 +16,6 @@ settings:
   label: 'Subsite navigation'
   provider: localgov_subsites
   label_display: '0'
+  context_mapping:
+    node: '@node.node_route_context:node'
 visibility: {  }