Skip to content

Commit

Permalink
Merge pull request #468 from usagov/stage
Browse files Browse the repository at this point in the history
Sprint 47: release to PROD
  • Loading branch information
rayestrada authored Dec 5, 2023
2 parents 57f4c52 + 8aa8324 commit 2f640e5
Show file tree
Hide file tree
Showing 241 changed files with 26,562 additions and 462 deletions.
42 changes: 21 additions & 21 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
cf run-task ${project}-drupal-${CIRCLE_BRANCH} --command "ENV=${CIRCLE_BRANCH} scripts/upkeep" --name "${project}-${CIRCLE_BRANCH}-upkeep" -k "2G" -m 512M
build-theme:
docker:
- image: node:18-slim
- image: node:20-slim
steps:
- checkout
- run:
Expand All @@ -41,7 +41,7 @@ jobs:
- persist_to_workspace:
root: ~/
paths:
- project/web/themes/custom/vote_gov/dist
- project/web/themes/custom/votegov/dist
cypress:
docker:
- image: cypress/included:cypress-12.3.0-node-16.18.1-chrome-109.0.5414.74-1-ff-109.0-edge-109.0.1518.52-1
Expand Down Expand Up @@ -292,15 +292,15 @@ workflows:
- stage
requires:
- deploy
- cypress:
filters:
branches:
only:
- test
- dev
- stage
requires:
- upkeep
# - cypress:
# filters:
# branches:
# only:
# - test
# - dev
# - stage
# requires:
# - upkeep
deploy-prod-workflow:
when:
and:
Expand All @@ -325,16 +325,16 @@ workflows:
- equal: [ true, << pipeline.parameters.upkeep >> ]
jobs:
- upkeep
link-validation-workflow:
triggers:
- schedule:
cron: '0 10 * * 1,4'
filters:
branches:
only:
- stage
jobs:
- link-validation
# link-validation-workflow:
# triggers:
# - schedule:
# cron: '0 10 * * 1,4'
# filters:
# branches:
# only:
# - stage
# jobs:
# - link-validation
scheduled-backup-workflow:
when:
and:
Expand Down
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ updates:
- "npm"
- "dependencies"
- package-ecosystem: "npm" # See documentation for possible values
directory: "/web/themes/custom/vote_gov/" # Location of package manifests
directory: "/web/themes/custom/votegov/" # Location of package manifests
schedule:
interval: "weekly"
labels:
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ node_modules

# Ignore Theme dist files
/web/themes/custom/vote_gov/dist/
/web/themes/custom/votegov/dist/

# Allow cloud.gov settings file.
!web/sites/default/settings.cloudgov.php
Expand All @@ -85,4 +86,4 @@ node_modules

scheduled_backup/*
env:/
cms/
cms/
10 changes: 5 additions & 5 deletions .lando.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,15 @@ tooling:
npm-theme:
service: node
description: Runs npm commands
cmd: npm --prefix /app/web/themes/custom/vote_gov
cmd: npm --prefix /app/web/themes/custom/votegov
gulp:
service: node
dir: "/app/web/themes/custom/vote_gov"
cmd: npm run gulp --prefix /app/web/themes/custom/vote_gov
dir: "/app/web/themes/custom/votegov"
cmd: npm run gulp --prefix /app/web/themes/custom/votegov
gulp-compile:
service: node
dir: "/app/web/themes/custom/vote_gov"
cmd: npm run build --prefix /app/web/themes/custom/vote_gov
dir: "/app/web/themes/custom/votegov"
cmd: npm run build --prefix /app/web/themes/custom/votegov
# Custom lando command, to sync Drupal db with updates, config changes in codebase.
'cy:axe':
service: node
Expand Down
2 changes: 2 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
"drupal/devel": "^5.1",
"drupal/disable_language": "^1.0@beta",
"drupal/double_field": "^4.1",
"drupal/easy_breadcrumb": "^2.0",
"drupal/editoria11y": "^2.0",
"drupal/entity_reference_revisions": "^1.10",
"drupal/field_group": "^3.4",
Expand Down Expand Up @@ -75,6 +76,7 @@
"drupal/translatable_menu_link_uri": "^2.0@dev",
"drupal/twig_field_value": "^2.0",
"drupal/twig_tweak": "^3.2",
"drupal/uswds_templates": "^3.0@dev",
"drush/drush": "^11.3"
},
"require-dev": {
Expand Down
126 changes: 124 additions & 2 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions config/sync/bixal_uswds.settings.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
_core:
default_config_hash: cI-Pl1vK4EZIlVhkBeRB-LcoEoKTUgI5gdJ7paB8cQk
favicon:
use_default: true
features:
comment_user_picture: true
comment_user_verification: true
favicon: true
node_user_picture: true
logo:
use_default: true
time_picker_style: html5_time_picker
32 changes: 32 additions & 0 deletions config/sync/block.block.bixal_uswds_breadcrumbs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
uuid: 9d925d66-c067-4f97-b040-543c96e23916
langcode: en
status: true
dependencies:
module:
- node
- system
theme:
- bixal_uswds
_core:
default_config_hash: W00dRxBD1MUkvdrG5GCp5ucRMano3bszsmhxU8gkn4E
id: bixal_uswds_breadcrumbs
theme: bixal_uswds
region: breadcrumb
weight: 0
provider: null
plugin: system_breadcrumb_block
settings:
id: system_breadcrumb_block
label: Breadcrumbs
label_display: '0'
provider: system
visibility:
'entity_bundle:node':
id: 'entity_bundle:node'
negate: false
context_mapping:
node: '@node.node_route_context:node'
bundles:
article: article
bx_update: bx_update
page: page
22 changes: 22 additions & 0 deletions config/sync/block.block.bixal_uswds_content.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
uuid: 2b0e2fb8-f0e6-4673-aa12-57a4701ff740
langcode: en
status: true
dependencies:
module:
- system
theme:
- bixal_uswds
_core:
default_config_hash: 2G5FjlDbZWWDTiD3NUntBHFuQ4sFrp1VsMH2kKIDB2I
id: bixal_uswds_content
theme: bixal_uswds
region: content
weight: -6
provider: null
plugin: system_main_block
settings:
id: system_main_block
label: 'Main page content'
label_display: '0'
provider: system
visibility: { }
22 changes: 22 additions & 0 deletions config/sync/block.block.bixal_uswds_local_tasks.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
uuid: fce6a776-e80f-4975-9fe8-8eb25533bcb4
langcode: en
status: true
dependencies:
theme:
- bixal_uswds
_core:
default_config_hash: ezVrmCOm0kkrQu3AkWTHOJo9DOQPkTDQcpUqjCx3QIQ
id: bixal_uswds_local_tasks
theme: bixal_uswds
region: help
weight: -5
provider: null
plugin: local_tasks_block
settings:
id: local_tasks_block
label: Tabs
label_display: '0'
provider: core
primary: true
secondary: true
visibility: { }
Loading

0 comments on commit 2f640e5

Please sign in to comment.