Merge branch 'release/4.1.0'

Release/4.1.0

.circleci/config.yml

@@ -4,7 +4,7 @@ aliases:
   - &job-build
     working_directory: /app
     docker:
-      - image: &builder-image "ghcr.io/dpc-sdp/bay/ci-builder:5.x"
+      - image: &builder-image "ghcr.io/dpc-sdp/bay/ci-builder:6.x"
         environment:
           INSTALL_NEW_SITE: 1
           LAGOON_ENVIRONMENT_TYPE: ci

.github/pull_request_template.md

@@ -0,0 +1,11 @@
+### Jira
+
+### Problem/Motivation
+
+### Fix
+
+### Related PRs
+
+### Screenshots
+
+### TODO

.github/workflows/build.yml

@@ -0,0 +1,38 @@
+name: build
+
+on:
+  push:
+  workflow_dispatch:
+
+jobs:
+  set_status_in_progress:
+    name: set_status_in_progress
+    if: always()
+    uses: dpc-sdp/github-actions/.github/workflows/[email protected]
+    secrets: inherit
+    with:
+      context: 'tide_build'
+      description: 'Tide Build running...'
+      state: 'pending'
+      target_url: ${{ github.event.repository.html_url }}/actions/runs/${{ github.run_id }}
+  tide_build:
+    name: tide_build
+    secrets: inherit
+    uses: dpc-sdp/github-actions/.github/workflows/[email protected]
+    with:
+      module_build: true
+      runner: biggy-tide
+  export_config:
+    name: export_config
+    secrets: inherit
+    uses: dpc-sdp/github-actions/.github/workflows/[email protected]
+  set_status:
+    name: set_status
+    needs: [tide_build]
+    if: always()
+    uses: dpc-sdp/github-actions/.github/workflows/[email protected]
+    secrets: inherit
+    with:
+      context: 'tide_build'
+      description: 'Tide Build'
+      target_url: ${{ github.event.repository.html_url }}/actions/runs/${{ github.run_id }}

.github/workflows/dorg_git_sync.yml

@@ -0,0 +1,14 @@
+name: dorg_git_sync
+
+on:
+  push:
+    branches:
+      - master
+    tags:
+      - '*'
+
+jobs:
+  dorg_git_sync:
+    name: dorg_git_sync
+    uses: dpc-sdp/github-actions/.github/workflows/[email protected]
+    secrets: inherit

.github/workflows/merge_to_reference.yml

@@ -0,0 +1,31 @@
+name: merge_to_reference
+
+on:
+  push:
+    branches:
+      - develop
+
+jobs:
+  set_status_in_progress:
+    name: set_status_in_progress
+    if: always()
+    uses: dpc-sdp/github-actions/.github/workflows/[email protected]
+    secrets: inherit
+    with:
+      context: 'tide_merge_to_reference'
+      description: 'Merge to reference running...'
+      state: 'pending'
+      target_url: ${{ github.event.repository.html_url }}/actions/runs/${{ github.run_id }}
+  tide_merge_to_reference:
+    name: tide_merge_to_reference
+    uses: dpc-sdp/github-actions/.github/workflows/[email protected]
+  set_status:
+    name: set_status
+    needs: [tide_merge_to_reference]
+    if: always()
+    uses: dpc-sdp/github-actions/.github/workflows/[email protected]
+    secrets: inherit
+    with:
+      context: 'tide_merge_to_reference'
+      description: 'Merge to reference running...'
+      target_url: ${{ github.event.repository.html_url }}/actions/runs/${{ github.run_id }}

composer.dev.json

@@ -6,16 +6,16 @@
         "composer/installers": "^1.9",
         "cweagans/composer-patches": "^1.6.0",
         "drupal/core-composer-scaffold": "^10.0",
-        "drupal/core": "10.1.7",
-        "drupal/core-recommended": "10.1.7",
-        "drush/drush": "^11",
+        "drupal/core": "10.2.5",
+        "drupal/core-recommended": "10.2.5",
+        "drush/drush": "^12",
         "vlucas/phpdotenv": "^4.1",
         "webflo/drupal-finder": "^1.0"
     },
     "require-dev": {
         "behat/behat": "^3.5",
         "behat/mink-selenium2-driver": "^1.4",
-        "chi-teck/drupal-code-generator": "^2.6.2",
+        "chi-teck/drupal-code-generator": "^3.0",
         "squizlabs/php_codesniffer": "3.7.1",
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7",
         "drupal/coder": "^8.3.10",
@@ -33,7 +33,7 @@
         "weitzman/drupal-test-traits": "^1.5",
         "php-http/message": "~1.13",
         "php-http/message-factory": "^1.1",
-        "guzzlehttp/psr7": "~2.5.0",
+        "guzzlehttp/psr7": "~2.6.2",
         "dpc-sdp/tide_test": "^4.0.0",
         "drupal/test_helpers": "^1.2"
     },

docker-compose.yml

@@ -6,7 +6,7 @@
 version: '2.3'
 
 x-bay-image-version:
-  &bay-image-version ${BAY_IMAGE_VERSION:-5.x}
+  &bay-image-version ${BAY_IMAGE_VERSION:-6.x}
 
 x-project:
   &project ${PROJECT_NAME:-mysite}
@@ -41,7 +41,7 @@ x-environment:
   LAGOON_ROUTE: ${LOCALDEV_URL:-http://mysite.docker.amazee.io}
   GITHUB_TOKEN: ${GITHUB_TOKEN:-}
   BAY_KEY: ${BAY_KEY:-}
-  BAY_IMAGE_VERSION: ${BAY_IMAGE_VERSION:-5.x}
+  BAY_IMAGE_VERSION: ${BAY_IMAGE_VERSION:-6.x}
   LAGOON_ENVIRONMENT_TYPE: ${LAGOON_ENVIRONMENT_TYPE:-local}
   DRUPAL_REFRESH_SEARCHAPI: ${DRUPAL_REFRESH_SEARCHAPI:-}
   # Uncomment to enable Xdebug and then restart via `ahoy up`.
@@ -110,7 +110,7 @@ services:
       lagoon.name: nginx-php
 
   mariadb:
-    image: "ghcr.io/dpc-sdp/bay/mariadb:${BAY_IMAGE_VERSION:-5.x}"
+    image: "ghcr.io/dpc-sdp/bay/mariadb:${BAY_IMAGE_VERSION:-6.x}"
     environment:
       << : *default-environment
     ports:
@@ -147,7 +147,7 @@ services:
       lagoon.type: none
 
   clamav:
-    image: "ghcr.io/dpc-sdp/bay/clamav:${BAY_IMAGE_VERSION:-5.x}"
+    image: "clamav/clamav-debian:1.2.0-6"
     environment:
       <<: *default-environment
     ports: