Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

USAGOV-2152 - Deploy to Production #2157

Merged
merged 84 commits into from
Jan 8, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
ceb550e
USAGOV-2101-add-codeowners: Add CODEOWNERS file, with benefits-finder…
akf Nov 22, 2024
94db525
USAGOV-2023-permissions-report-redux: Adding permissions spreadsheet …
jacobaaronyeager Dec 2, 2024
c6506e1
USAGOV-2133-readme-improvements: init commit for README.md file
whitealbum Dec 12, 2024
896ef71
USAGOV-2133-readme-improvements: additional edits
whitealbum Dec 12, 2024
980ef35
USAGOV-2133-readme-improvements: final changes
whitealbum Dec 13, 2024
6814908
USAGOV-2133-readme-improvements: Merge branch 'dev' of github.com:usa…
whitealbum Dec 13, 2024
17b709e
USAGOV-2124-composer-installers-deprecated: replaced composer/install…
whitealbum Dec 16, 2024
9c55787
USAGOV-2124-composer-installers-deprecated: returned composer/installers
whitealbum Dec 16, 2024
40b64fe
USAGOV-2133-readme-improvements: Merge remote-tracking branch 'origin…
whitealbum Dec 17, 2024
0b1b232
USAGOV-2124-composer-installers-deprecated: merge with dev
whitealbum Dec 17, 2024
491e12f
USAGOV-2124-composer-installers-deprecated: Merge remote-tracking bra…
whitealbum Dec 17, 2024
6b82b78
USAGOV-2133-readme-improvements: Merge remote-tracking branch 'origin…
whitealbum Dec 17, 2024
b7ebce8
USAGOV-2101-add-codeowners: Merge remote-tracking branch 'origin/dev'…
akf Dec 18, 2024
c7f89ed
USAGOV-2101-add-codeowners: Update codeowners and use github handles …
akf Dec 18, 2024
acbf58e
Merge branch 'dev' into USAGOV-2124-composer-installers-deprecated
akf Dec 19, 2024
e34364b
USAGOV-2116-phsptan-config: Installs phpstan with Drupal rules.
omerida Dec 19, 2024
9d2b753
USAGOV-2116-phsptan-config: Document phpstan usage.
omerida Dec 19, 2024
0ca962c
USAGOV-2104: USAGOV-2104 Changes to the updated Published Pages Report
Dec 19, 2024
c52f5ea
USAGOV-2116-phsptan-config: Update config to pull in the rules from p…
omerida Dec 19, 2024
3fd2fae
USAGOV-2103: USAGOV-2103 Add the federal agency letter pages to the P…
Dec 19, 2024
c6b3403
USAGOV-2116-phsptan-config: Merge branch 'dev' into USAGOV-2116-phspt…
omerida Dec 20, 2024
7b8f11f
USAGOV-2150-es-wizard-crumb: Removes the if-clause to prepend Spanish…
omerida Dec 20, 2024
816f6fa
Merge branch 'dev' into USAGOV-2101-add-codeowners
akf Dec 20, 2024
16a5995
USAGOV-2150-es-wizard-crumb: Remove comment per review request.
omerida Dec 20, 2024
04a88e5
USAGOV-2101-add-codeowners: Added more bf patterns, comments, and mad…
akf Dec 20, 2024
cfe4695
USAGOV-2101-add-codeowners: Add benefits-finder workflow actions to C…
akf Dec 20, 2024
0102891
USAGOV-2124-composer-installers-deprecated: Merge remote-tracking bra…
whitealbum Dec 23, 2024
0a14da6
USAGOV-2124-composer-installers-deprecated: blah
whitealbum Dec 23, 2024
b82e9a9
USAGOV-2124-composer-installers-deprecated: reinstalling composer/ins…
whitealbum Dec 23, 2024
3a10cb6
USAGOV-2133-readme-improvements: Merge remote-tracking branch 'origin…
whitealbum Dec 23, 2024
7921e2b
USAGOV-2133-readme-improvements: requested updates
whitealbum Dec 23, 2024
08d12e1
USAGOV-2103 Add fed agency letter pages to the Pub Pages Report (#2134)
DaleMHFrey Dec 23, 2024
fcc6d24
Revert "USAGOV-2104: USAGOV-2103 Add the federal agency letter pages …
Dec 23, 2024
8ea584d
Merge branch 'dev' into USAGOV-2101-add-codeowners
whitealbum Dec 24, 2024
c76d528
USAGOV-1531-remove-menu_entity_index: turned off Menu Entity Index op…
whitealbum Dec 24, 2024
a9c37e6
USAGOV-1531-remove-menu_entity_index: uninstalled module but still in…
whitealbum Dec 24, 2024
45ace41
Merge branch 'dev' into USAGOV-2133-readme-improvements
whitealbum Dec 26, 2024
1fda53e
Merge branch 'dev' into USAGOV-2124-composer-installers-deprecated
whitealbum Dec 26, 2024
73627a6
Merge branch 'dev' into USAGOV-2116-phsptan-config
whitealbum Dec 26, 2024
610ff82
Merge branch 'dev' into USAGOV-2150-es-wizard-crumb
whitealbum Dec 26, 2024
c078be2
USAGOV-2150-es-wizard-crumb: Use alias path manager to get the URL wi…
omerida Dec 26, 2024
05c7889
USAGOV-2150-es-wizard-crumb: Merge remote-tracking branch 'origin/USA…
omerida Dec 26, 2024
f9a1c2b
USAGOV-2150-es-wizard-crumb: Remove linewrap
omerida Dec 26, 2024
e50dd0e
USAGOV-2116-phsptan-config: Updating instructions for installing phpstan
omerida Dec 26, 2024
99acba2
Merge branch 'dev' into USAGOV-2101-add-codeowners
akf Dec 27, 2024
a1e8a62
USAGOV-2101: Add CODEOWNERS (#2128)
akf Dec 27, 2024
5207100
Merge branch 'dev' into USAGOV-2133-readme-improvements
akf Dec 27, 2024
83cc00f
Usagov 2133 readme improvements (#2122)
akf Dec 27, 2024
57e43e0
Merge branch 'dev' into USAGOV-2124-composer-installers-deprecated
akf Dec 27, 2024
ab60e8e
Usagov 2124 composer installers deprecated (#2124)
akf Dec 27, 2024
a2bd654
USAGOV-2140: reporter needs ca-certificates (#2142)
akf Dec 27, 2024
d58080e
Merge branch 'dev' into USAGOV-2104
akf Dec 27, 2024
639d86d
USAGOV-2116-phsptan-config: Merge branch 'dev' into USAGOV-2116-phspt…
omerida Dec 27, 2024
8949d69
Merge branch 'dev' into USAGOV-2150-es-wizard-crumb
akf Dec 27, 2024
30cd1e8
USAGOV-2116-phsptan-config: Fixing Merge conflicts
omerida Dec 27, 2024
37acca2
Update README.md
omerida Dec 27, 2024
59c281f
USAGOV-2145-phsptan-circleci: Run PHPStan in an advisory mode on lint…
omerida Dec 19, 2024
c8dcc7a
USAGOV-2150-es-wizard-crumb: Removes the if-clause to prepend Spanish…
akf Dec 27, 2024
3826df9
USAGOV-2116-phsptan-config: Merge branch 'dev' into USAGOV-2116-phspt…
omerida Dec 27, 2024
987e0a4
USAGOV-2134-orphaned-entities: Update the key used to track entity re…
omerida Dec 27, 2024
7ca7099
USAGOV-2116 PHPStan config (#2130)
akf Dec 27, 2024
36add8d
Merge branch 'dev' into USAGOV-1531-remove-menu_entity_index
akf Dec 27, 2024
482ec0b
Usagov 1531 remove menu entity index (#2141)
akf Dec 27, 2024
37005cd
USAGOV-2145-phsptan-circleci: Merge branch 'dev' into USAGOV-2145-phs…
omerida Dec 30, 2024
062d7ba
Merge branch 'dev' into USAGOV-2134-orphaned-entities
omerida Dec 30, 2024
247b5f7
USAGOV-2136: USAGOV-2136 - docker-compose clean up
Dec 30, 2024
80adab5
USAGOV-2136: USAGOV-2136 - also remove Dockerfile no longer used
Dec 30, 2024
352d5b0
USAGOV-2145 phsptan circleci (#2131)
akf Dec 30, 2024
cad1b34
Merge branch 'dev' into USAGOV-2134-orphaned-entities
akf Dec 30, 2024
2a471fa
USAGOV-2134-orphaned-entities: (#2144)
akf Dec 30, 2024
9431dbf
Merge branch 'dev' into USAGOV-2136
akf Dec 30, 2024
0b5db75
USAGOV-2136: docker-compose clean up (#2145)
akf Dec 30, 2024
d0bed79
USAGOV-2104: USAGOV-2104 PR-reviews
Dec 30, 2024
49e7036
USAGOV-2023-permissions-report-redux: Merge branch 'dev' into USAGOV-…
jacobaaronyeager Dec 30, 2024
e5bb8f3
USAGOV-2023-permissions-report-redux: updating content-hash
jacobaaronyeager Dec 31, 2024
e8862c9
Merge branch 'dev' into USAGOV-2104
omerida Dec 31, 2024
8144e60
USAGOV-2023-permissions-report-redux: Adding permissions spreadsheet …
akf Dec 31, 2024
d7f5720
Merge branch 'stage' into dev
arpage Jan 2, 2025
da2a586
USAGOV-2104: fixing lint errors
Jan 2, 2025
3404d74
USAGOV-2104: fixing lint errors
Jan 2, 2025
e16b0cb
Merge branch 'dev' into USAGOV-2104
omerida Jan 2, 2025
f4146b2
USAGOV-2104: USAGOV-2104 Changes to the updated Published Pages Repor…
omerida Jan 2, 2025
b5bbcc4
USAGOV-2152 Deploy to Staging (#2152)
arpage Jan 2, 2025
bdc20cc
Merge branch 'prod' into stage
arpage Jan 8, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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