Merge branch 'develop' into feature/remove_tide_page_from_default_list

.circleci/config.yml

@@ -1,10 +1,20 @@
 version: 2
 aliases:
+  - &ssh_key_fingerprint "36:03:e3:ca:b3:0b:82:18:e2:e9:ae:5d:81:17:86:b1"
+  # Fingerprint of the SSH deploy key of the project used to pull code.
+  # The value can be found in CircleCI UI -> SSH Permissions.
+
+  - &step_configure_git
+    run:
+      name: Configure git
+      command: |
+        git config --global user.email "$DEPLOY_USER_EMAIL" && git config --global user.name "$DEPLOY_USER_NAME"
+        
   # Re-usable job to run different types of builds.
   - &job-build
-    working_directory: /app
+    working_directory: &working-directory /app
     docker:
-      - image: &builder-image singledigital/bay-ci-builder:4.x
+      - image: &builder-image singledigital/bay-ci-builder:5.x
         environment:
           INSTALL_NEW_SITE: 1
           LAGOON_ENVIRONMENT_TYPE: ci
@@ -25,6 +35,35 @@ aliases:
       - store_artifacts:
           path: /tmp/artifacts
 
+  # Job to perform merge to reference branch after a merge to develop.
+  - &merge-to-reference
+    working_directory: *working-directory
+    docker:
+      - image: *builder-image
+        auth:
+          username: $DOCKERHUB_USERNAME
+          password: $DOCKERHUB_PASSWORD
+        environment:
+          LAGOON_ENVIRONMENT_TYPE: ci
+          SSH_KEY_FINGERPRINT: *ssh_key_fingerprint
+          DEPLOY_USER_EMAIL: [email protected]
+          DEPLOY_USER_NAME: sdpdeploy
+    steps:
+      - attach_workspace:
+          at: /workspace
+      - checkout
+      - *step_configure_git
+      - setup_remote_docker:
+          docker_layer_caching: true
+      - add_ssh_keys:
+          fingerprints:
+            - *ssh_key_fingerprint
+      - run:
+          name: Merge to reference branch
+          command: .circleci/merge-to-reference.sh
+          no_output_timeout: 30m
+
+
 jobs:
   build:
     <<: *job-build
@@ -38,10 +77,26 @@ jobs:
           LAGOON_ENVIRONMENT_TYPE: ci
           INSTALL_SUGGEST: 1
           BEHAT_PROFILE: "--profile=suggest"
+
+  merge_to_reference:
+    <<: *merge-to-reference
 
+
 workflows:
   version: 2
   main:
     jobs:
       - build
-      - build_suggest
+      - build_suggest:
+          filters:
+            branches:
+              ignore:
+                - reference
+
+  mergetoreference:
+    jobs:
+      - merge_to_reference:
+          filters:
+            branches:
+              only:
+                - develop

.circleci/merge-to-reference.sh

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+##
+# Merge develop to reference branch in CI.
+#
+
+echo "==> Checking out reference branch"
+git checkout reference
+echo "==> Merging develop to reference branch"
+git merge develop
+git checkout develop -- composer.json
+git add .
+echo "==> Replacing composer require entries starting with dpc-sdp with value dev-reference"
+cat composer.json | gojq '.require |= with_entries(
+  if (.key | test("dpc-sdp/tide"))
+  then .value = "dev-reference" end)' > composer.json.backup
+mv -f composer.json.backup composer.json
+echo "==> Add all changes"
+git add .
+git commit -m "Merge changes from develop."
+echo "==> Push the changes to remote reference branch"
+git push origin --force reference

.github/workflows/build.yml

@@ -0,0 +1,36 @@
+name: build
+
+on: push
+
+jobs:
+  set_status_in_progress:
+    name: set_status_in_progress
+    if: always()
+    uses: dpc-sdp/github-actions/.github/workflows/set_status.yml@main
+    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/tide_build.yml@main
+    with:
+      module_build: true
+      runner: biggy-tide
+  export_config:
+    name: export_config
+    secrets: inherit
+    uses: dpc-sdp/github-actions/.github/workflows/export_config.yml@main
+  set_status:
+    name: set_status
+    needs: [tide_build]
+    if: always()
+    uses: dpc-sdp/github-actions/.github/workflows/set_status.yml@main
+    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/dorg_git_sync.yml@main
+    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/set_status.yml@main
+    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/tide_merge_to_reference.yml@main
+  set_status:
+    name: set_status
+    needs: [tide_merge_to_reference]
+    if: always()
+    uses: dpc-sdp/github-actions/.github/workflows/set_status.yml@main
+    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.json

@@ -1,33 +1,33 @@
 {
     "name": "dpc-sdp/tide",
-    "description": "Tide Drupal 9 profile",
+    "description": "Tide Drupal 10 profile",
     "type": "drupal-profile",
     "license": "GPL-2.0-or-later",
     "require": {
-        "dpc-sdp/tide_alert": "3.0.0",
-        "dpc-sdp/tide_api": "3.0.0",
-        "dpc-sdp/tide_authenticated_content": "3.0.0",
-        "dpc-sdp/tide_core": "3.0.0",
-        "dpc-sdp/tide_demo_content": "3.0.0",
-        "dpc-sdp/tide_event": "3.0.0",
-        "dpc-sdp/tide_event_atdw": "3.0.0",
-        "dpc-sdp/tide_grant": "3.0.0",
-        "dpc-sdp/tide_landing_page": "3.0.0",
-        "dpc-sdp/tide_media": "3.0.0",
-        "dpc-sdp/tide_monsido": "3.0.0",
-        "dpc-sdp/tide_news": "3.0.0",
-        "dpc-sdp/tide_page": "3.0.0",
-        "dpc-sdp/tide_profile": "3.0.0",
-        "dpc-sdp/tide_publication": "3.0.0",
-        "dpc-sdp/tide_search": "3.0.0",
-        "dpc-sdp/tide_site": "3.0.0",
-        "dpc-sdp/tide_test": "3.0.0",
-        "dpc-sdp/tide_webform": "3.0.0"
+        "dpc-sdp/tide_alert": "4.0.0",
+        "dpc-sdp/tide_api": "4.0.0",
+        "dpc-sdp/tide_core": "4.0.1",
+        "dpc-sdp/tide_demo_content": "4.0.0",
+        "dpc-sdp/tide_event": "4.0.0",
+        "dpc-sdp/tide_grant": "4.0.0",
+        "dpc-sdp/tide_landing_page": "4.0.0",
+        "dpc-sdp/tide_media": "4.0.0",
+        "dpc-sdp/tide_news": "4.0.0",
+        "dpc-sdp/tide_profile": "4.0.0",
+        "dpc-sdp/tide_publication": "4.0.0",
+        "dpc-sdp/tide_search": "4.0.1",
+        "dpc-sdp/tide_site": "4.0.0",
+        "dpc-sdp/tide_test": "4.0.0",
+        "dpc-sdp/tide_webform": "4.0.0"
     },
     "repositories": {
         "drupal": {
             "type": "composer",
-            "url": "https://packages.drupal.org/9"
+            "url": "https://packages.drupal.org/10"
+        },
+        "asset-packagist": {
+            "type": "composer",
+            "url": "https://asset-packagist.org"
         }
     }
 }

config/install/block.block.seven_breadcrumbs.yml

@@ -4,9 +4,9 @@ dependencies:
   module:
     - system
   theme:
-    - seven
+    - claro
 id: seven_breadcrumbs
-theme: seven
+theme: claro
 region: breadcrumb
 weight: 0
 provider: null

config/install/block.block.seven_content.yml

@@ -4,9 +4,9 @@ dependencies:
   module:
     - system
   theme:
-    - seven
+    - claro
 id: seven_content
-theme: seven
+theme: claro
 region: content
 weight: 0
 provider: null

config/install/block.block.seven_local_actions.yml

@@ -2,9 +2,9 @@ langcode: en
 status: true
 dependencies:
   theme:
-    - seven
+    - claro
 id: seven_local_actions
-theme: seven
+theme: claro
 region: content
 weight: -10
 provider: null

config/install/block.block.seven_login.yml

@@ -4,9 +4,9 @@ dependencies:
   module:
     - user
   theme:
-    - seven
+    - claro
 id: seven_login
-theme: seven
+theme: claro
 region: content
 weight: 10
 provider: null

config/install/block.block.seven_messages.yml

@@ -4,9 +4,9 @@ dependencies:
   module:
     - system
   theme:
-    - seven
+    - claro
 id: seven_messages
-theme: seven
+theme: claro
 region: highlighted
 weight: 0
 provider: null

config/install/block.block.seven_page_title.yml

@@ -2,9 +2,9 @@ langcode: en
 status: true
 dependencies:
   theme:
-    - seven
+    - claro
 id: seven_page_title
-theme: seven
+theme: claro
 region: header
 weight: -30
 provider: null

config/install/block.block.seven_primary_local_tasks.yml

@@ -2,9 +2,9 @@ langcode: en
 status: true
 dependencies:
   theme:
-    - seven
+    - claro
 id: seven_primary_local_tasks
-theme: seven
+theme: claro
 region: header
 weight: 0
 provider: null

config/install/block.block.seven_secondary_local_tasks.yml

@@ -2,9 +2,9 @@ langcode: en
 status: true
 dependencies:
   theme:
-    - seven
+    - claro
 id: seven_secondary_local_tasks
-theme: seven
+theme: claro
 region: pre_content
 weight: 0
 provider: null