Skip to content

Commit

Permalink
Merge branch 'release/1.8.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
richardgaunt committed Sep 30, 2024
2 parents be4b5a4 + 6df8db5 commit 632e50a
Show file tree
Hide file tree
Showing 28 changed files with 1,493 additions and 995 deletions.
16 changes: 8 additions & 8 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,22 +25,22 @@ aliases:
# Generate a separate SSH key for a user who has push permissions to
# $DREVOPS_DEPLOY_ARTIFACT_GIT_REMOTE repo with `ssh-keygen -m PEM -t rsa -C "[email protected]"
# command and add private key under "SSH Permissions" in CircleCI UI.
- &deploy_ssh_fingerprint "bc:87:4a:74:cf:e0:02:4e:34:aa:16:b5:c3:6f:89:cd"
- &deploy_ssh_fingerprint "62:69:fb:89:f9:20:e2:24:dd:bd:47:7d:a0:2c:d8:38"

# SSH key fingerprint to deploy code to civictheme at Drupal.org.
- &deploy_ssh_fingerprint1 "3d:ac:b0:f2:1b:8f:19:16:f2:98:e9:3d:53:2a:77:67"
- &deploy_ssh_fingerprint1 "fb:3d:43:5a:fe:77:5e:82:e3:c2:2a:d0:a5:02:b4:b1"

# SSH key fingerprint to deploy code to civictheme_govcms.
- &deploy_ssh_fingerprint2 "a9:33:24:68:20:f9:91:24:b8:38:c5:f3:b6:4b:34:5d"
- &deploy_ssh_fingerprint2 "77:a4:7a:c3:af:38:f6:2e:80:71:6b:a6:7e:2b:86:8a"

# SSH key fingerprint to deploy code to civictheme_content.
- &deploy_ssh_fingerprint3 "a3:41:d1:47:85:4c:5d:12:9c:4c:1f:a2:67:d3:a5:3f"
- &deploy_ssh_fingerprint3 "68:3c:13:25:00:1e:5e:2e:f5:a2:1c:db:ea:f3:99:71"

# SSH key fingerprint to deploy code to civictheme_admin.
- &deploy_ssh_fingerprint4 "ab:76:65:9f:76:02:c2:b9:2a:bc:81:db:a0:c6:37:59"
- &deploy_ssh_fingerprint4 "a8:5e:36:41:cb:b7:f8:ec:69:ba:c6:f4:83:c5:40:3d"

# SSH key fingerprint to mirror code.
- &git_mirror_ssh_fingerprint "88:48:44:13:07:7a:a7:da:8c:fb:5e:a7:62:45:73:c4"
- &git_mirror_ssh_fingerprint "3c:ff:01:e7:02:01:cd:96:ff:cf:43:ea:38:19:72:39"

#-----------------------------------------------------------------------------
# Optional variables.
Expand Down Expand Up @@ -295,7 +295,7 @@ jobs:
docker:
- image: cimg/php:8.2-browsers
environment:
DRUPAL_VERSION: 10.1
DRUPAL_VERSION: 10.2
DRUPAL_PROJECT_SHA: 10.x
<<: *job-build-isolated

Expand All @@ -304,7 +304,7 @@ jobs:
docker:
- image: cimg/php:8.2-browsers
environment:
DRUPAL_VERSION: 10.1
DRUPAL_VERSION: 10.2
DRUPAL_PROJECT_SHA: 10.x
<<: *job-build-isolated

Expand Down
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Checklist before requesting a review

- [ ] I have formatted the subject to include ticket number as `[CS-123] Verb in past tense with dot at the end.`
- [ ] I have formatted the subject to include ticket number as `Issue #123456 by drupal_org_username: Issue title`
- [ ] I have added a link to the issue tracker
- [ ] I have provided information in `Changed` section about WHY something was done if this was not a normal implementation
- [ ] I have performed a self-review of my code
Expand Down
Loading

0 comments on commit 632e50a

Please sign in to comment.