Skip to content

Commit

Permalink
Merge branch 'develop' into YALB-1057-quotes
Browse files Browse the repository at this point in the history
  • Loading branch information
nJim committed Sep 2, 2023
2 parents 5af9755 + 82b7017 commit 424daf6
Show file tree
Hide file tree
Showing 163 changed files with 6,387 additions and 1,439 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/build_deploy_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -206,10 +206,6 @@ jobs:
run: |
./.ci/build/build_frontend
- name: Setup tmate session
if: ${{ failure() }}
uses: mxschmitt/action-tmate@v3

# Deploy to Pantheon
- name: deploy to Pantheon
env:
Expand Down
23 changes: 23 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Create a release
on:
push:
branches: master
env:
GH_TOKEN: ${{ secrets.YALESITES_BUILD_TOKEN }}
jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Install Node.js
uses: actions/setup-node@v3

- name: Install
env:
GH_TOKEN: ${{ secrets.GH_TOKEN }}
run: npm install

- name: Release
run: npx semantic-release
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,4 @@ _Notes:_
- `confim` Imports the current config files to your database.
- `local:theme-link` Run this script once to establish `npm link`s to all of the frontend-related repositories.
- `local:cl-dev` Enables a frontend developer to work across all of the repositories (`yalesites-project`, `atomic`, and `component-library-twig`) in an environment configured to support both Storybook development, and have the changes reflected in the Drupal instance. Note: This also wires up the Tokens repo, but if you want to watch for changes there, you'll have to run the `npm run develop` script inside the Tokens directory.
.
43 changes: 43 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,13 @@
"test": "./scripts/local/test.sh"
},
"devDependencies": {
"@semantic-release/git": "^10.0.1",
"@yalesites-org/eslint-config-and-other-formatting": "^1.5.0",
"eslint-config-drupal": "^5.0.2",
"eslint-plugin-jsx-a11y": "^6.5.1",
"eslint-plugin-react": "^7.29.4",
"eslint-plugin-yml": "^0.14.0",
"semantic-release-replace-plugin": "^1.2.7",
"shelljs": "^0.8.5"
},
"lint-staged": {
Expand All @@ -44,5 +46,46 @@
"web/**/*.{js,scss,php}": [
"npm run prettier"
]
},
"release": {
"branches": [
"master"
],
"plugins": [
"@semantic-release/commit-analyzer",
[
"semantic-release-replace-plugin",
{
"replacements": [
{
"files": [
"web/profiles/custom/yalesites_profile/yalesites_profile.info.yml"
],
"from": "version: .*",
"to": "version: ${nextRelease.version}",
"results": [
{
"file": "web/profiles/custom/yalesites_profile/yalesites_profile.info.yml",
"hasChanged": true,
"numMatches": 1,
"numReplacements": 1
}
],
"countMatches": true
}
]
}
],
[
"@semantic-release/git",
{
"assets": [
"web/profiles/custom/yalesites_profile/yalesites_profile.info.yml"
]
}
],
"@semantic-release/release-notes-generator",
"@semantic-release/github"
]
}
}
5 changes: 1 addition & 4 deletions scripts/local/confim.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
#!/bin/bash

lando drush updatedb -y
lando drush cr
lando drush config-import -y
lando drush cr
lando drush deploy
23 changes: 4 additions & 19 deletions web/private/scripts/confim.php
Original file line number Diff line number Diff line change
@@ -1,23 +1,8 @@
<?php

if ($_POST['user_email'] !== '[email protected]') {
// Update databases
echo "Running database updates...\n";
passthru('drush updatedb -y');
echo "Database updates complete.\n";

// Clear all cache
echo "Rebuilding cache...\n";
passthru('drush cr');
echo "Rebuilding cache complete.\n";

// Import all config changes.
echo "Importing configuration from yml files...\n";
passthru('drush config-import -y');
echo "Import of configuration complete.\n";

// Clear all cache
echo "Rebuilding cache...\n";
passthru('drush cr');
echo "Rebuilding cache complete.\n";
// Update databases.
echo "Running drush deploy...\n";
passthru('drush deploy');
echo "Drush deploy complete.\n";
}
7 changes: 6 additions & 1 deletion web/profiles/custom/yalesites_profile/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"drupal/address": "^1.10",
"drupal/admin_toolbar": "3.3.0",
"drupal/allowed_formats": "^2.0",
"drupal/auto_entitylabel": "^3.0",
"drupal/autosave_form": "^1.3",
"drupal/better_exposed_filters": "^6.0",
"drupal/block_content_permissions": "^1.11",
Expand Down Expand Up @@ -63,6 +64,7 @@
"drupal/node_revision_delete": "^1.0@RC",
"drupal/override_node_options": "^2.6",
"drupal/pantheon_advanced_page_cache": "^2.1",
"drupal/pantheon_secrets": "1.0.1",
"drupal/paragraphs": "^1.12",
"drupal/paragraphs_features": "^2.0@beta",
"drupal/pathauto": "^1.8",
Expand All @@ -84,7 +86,7 @@
"drupal/webform": "^6.2@beta",
"drupal/wingsuit_companion": "^2.0@RC",
"jjj/chosen": "^2.2",
"yalesites-org/atomic": "1.17.0",
"yalesites-org/atomic": "1.18.0",
"yalesites-org/yale_cas": "^1.0"
},
"minimum-stability": "dev",
Expand Down Expand Up @@ -126,6 +128,9 @@
},
"drupal/gin": {
"fix description toggle for CKEditor fields https://www.drupal.org/project/gin/issues/3316265": "https://git.drupalcode.org/project/gin/-/merge_requests/227.patch"
},
"drupal/redirect": {
"fix validation issue on adding url redirect": "https://www.drupal.org/files/issues/2023-08-09/3057250-65.patch"
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
status: 2
pattern: '[node:field_honorific_prefix] [node:field_first_name] [node:field_last_name]'
escape: false
preserve_titles: false
save: false
chunk: 50
dependencies:
config:
- node.type.profile
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
uuid: 1750e408-d227-4e53-9607-987cba895738
langcode: en
status: true
dependencies:
module:
- entity_redirect
third_party_settings:
entity_redirect:
redirect:
add:
active: 0
destination: default
url: ''
external: ''
edit:
active: 0
destination: default
url: ''
external: ''
delete:
active: 0
destination: default
url: ''
external: ''
anonymous:
active: 0
destination: default
url: ''
external: ''
id: directory
label: Directory
revision: 0
description: 'Display a list of profiles as a directory list including detailed contact information.'
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
uuid: 3ec0b7cb-2e3a-4b6d-b9c1-5fd0292eb82f
langcode: en
status: true
dependencies:
config:
- node.type.profile
id: node.profile.promote
field_name: promote
entity_type: node
bundle: profile
label: 'Promoted to front page'
description: ''
required: false
translatable: true
default_value:
-
value: 0
default_value_callback: ''
settings:
on_label: 'On'
off_label: 'Off'
field_type: boolean
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
uuid: 667c10bc-f35e-40dc-b00c-5fa1619d176c
langcode: en
status: true
dependencies:
config:
- node.type.profile
id: node.profile.sticky
field_name: sticky
entity_type: node
bundle: profile
label: 'Sticky at top of lists'
description: ''
required: false
translatable: true
default_value:
-
value: 0
default_value_callback: ''
settings:
on_label: 'On'
off_label: 'Off'
field_type: boolean
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
uuid: cca9c181-8043-40a7-abde-a1d3536c86f2
langcode: en
status: true
dependencies:
config:
- node.type.profile
id: node.profile.title
field_name: title
entity_type: node
bundle: profile
label: 'Display Name'
description: ''
required: true
translatable: true
default_value: { }
default_value_callback: ''
settings: { }
field_type: string
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
uuid: e3b685ac-6ba5-44b2-b684-d480c7ee65cf
langcode: en
status: true
dependencies:
config:
- block_content.type.directory
- field.field.block_content.directory.field_heading
- field.field.block_content.directory.field_instructions
module:
- allowed_formats
- markup
- maxlength
- text
id: block_content.directory.default
targetEntityType: block_content
bundle: directory
mode: default
content:
field_heading:
type: text_textfield
weight: 1
region: content
settings:
size: 60
placeholder: ''
third_party_settings:
allowed_formats:
hide_help: '1'
hide_guidelines: '1'
maxlength:
maxlength_js: 50
maxlength_js_label: 'Content limited to @limit characters, remaining: <strong>@remaining</strong>'
maxlength_js_enforce: false
field_instructions:
type: markup
weight: 0
region: content
settings: { }
third_party_settings: { }
hidden:
info: true
revision_log: true
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ content:
crop_list:
- banner_16_5
- card_3_2
- profile_1_1_
crop_types_required: { }
warn_multiple_usages: true
show_crop_area: false
Expand Down
Loading

0 comments on commit 424daf6

Please sign in to comment.