Skip to content

Commit

Permalink
USAGOV-2152 - Deploy to Production (#2157)
Browse files Browse the repository at this point in the history
  • Loading branch information
arpage authored Jan 8, 2025
2 parents dd4e2e6 + bdc20cc commit 94f0c9e
Show file tree
Hide file tree
Showing 18 changed files with 872 additions and 2,589 deletions.
6 changes: 6 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -322,11 +322,13 @@ jobs:
npm install --prefix ./web/themes/custom/usagov
composer global config --no-plugins allow-plugins.dealerdirect/phpcodesniffer-composer-installer true
composer global require --dev drupal/coder php-parallel-lint/php-parallel-lint
composer require --dev mglaman/phpstan-drupal phpstan/phpstan phpstan/phpstan-deprecation-rules
COMPOSER_DIR=$(composer -n config --global home)
$COMPOSER_DIR/vendor/bin/phpcs --config-set installed_paths $COMPOSER_DIR/vendor/drupal/coder/coder_sniffer,$COMPOSER_DIR/vendor/sirbrillig/phpcs-variable-analysis,$COMPOSER_DIR/vendor/slevomat/coding-standard
mkdir -p /tmp/results
touch /tmp/results/php-lint.log
touch /tmp/results/php-cs.log
touch /tmp/results/php-stan.log
touch /tmp/results/theme-lint.log
- run:
name: PHP Lint
Expand All @@ -338,6 +340,10 @@ jobs:
command: |
COMPOSER_DIR=$(composer -n config --global home)
$COMPOSER_DIR/vendor/bin/phpcs -ns --standard=./.phpcs.xml.dist | tee /tmp/results/php-cs.log
- run:
name: PHPStan (static analysis, non-blocking)
command: |
(./vendor/bin/phpstan --memory-limit=2G || true) | tee /tmp/results/php-stan.log
- run:
name: Theme Lint
command: npm run lint --prefix ./web/themes/custom/usagov | tee /tmp/results/theme-lint.log
Expand Down
11 changes: 0 additions & 11 deletions .docker/Dockerfile-mysql

This file was deleted.

3 changes: 2 additions & 1 deletion .docker/Dockerfile-reporter
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ RUN apk upgrade --update \
jq \
bash \
curl \
gettext
gettext \
ca-certificates

RUN chmod +x /createreport.sh \
&& npm install -g analytics-reporter
Expand Down
398 changes: 123 additions & 275 deletions README.md

Large diffs are not rendered by default.

20 changes: 14 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
}
],
"require": {
"composer/installers": "^1.9",
"composer/installers": "^2.3",
"cweagans/composer-patches": "^1.7",
"drupal/address": "^1.9",
"drupal/admin_toolbar": "^3.4",
Expand Down Expand Up @@ -55,6 +55,7 @@
"drupal/node_menus": "^3.0@alpha",
"drupal/paragraphs_entity_embed": "^3.0",
"drupal/pathauto": "^1.8",
"drupal/permission_spreadsheet": "^2.1",
"drupal/redirect": "^1.6",
"drupal/remove_http_headers": "^2.0",
"drupal/s3fs": "^3.3",
Expand Down Expand Up @@ -85,7 +86,7 @@
"prefer-stable": true,
"config": {
"optimize-autoloader": true,
"process-timeout":0,
"process-timeout": 0,
"sort-packages": true,
"allow-plugins": {
"composer/installers": true,
Expand All @@ -95,8 +96,7 @@
"wikimedia/composer-merge-plugin": true,
"dealerdirect/phpcodesniffer-composer-installer": true,
"cweagans/composer-patches": true,
"mglaman/composer-drupal-lenient": true,
"oomphinc/composer-installers-extender": true
"mglaman/composer-drupal-lenient": true
}
},
"extra": {
Expand All @@ -105,6 +105,9 @@
"web-root": "web/"
}
},
"installer-types": [
"drupal-module", "drupal-theme"
],
"installer-paths": {
"web/core": [
"type:drupal-core"
Expand Down Expand Up @@ -133,7 +136,6 @@
"web/themes/custom/{$name}": [
"type:drupal-custom-theme"
]

},
"patchLevel": {
"drupal/core": "-p2"
Expand Down Expand Up @@ -167,7 +169,10 @@
},
"require-dev": {
"drupal/coder": "^8.3",
"php-parallel-lint/php-parallel-lint": "^1.4"
"mglaman/phpstan-drupal": "*",
"php-parallel-lint/php-parallel-lint": "^1.4",
"phpstan/phpstan": "*",
"phpstan/phpstan-deprecation-rules": "*"
},
"scripts": {
"changed-files": [
Expand All @@ -187,6 +192,9 @@
],
"php-lint": [
"vendor/bin/parallel-lint -e php,module,inc,install,test,profile,theme ./web/modules/custom ./web/themes/custom"
],
"phpstan": [
"vendor/bin/phpstan --memory-limit=1G"
]
}
}
Loading

0 comments on commit 94f0c9e

Please sign in to comment.