Skip to content

Commit

Permalink
Merge pull request #562 from usdoj/develop
Browse files Browse the repository at this point in the history
Latest from develop
  • Loading branch information
brockfanning authored Oct 17, 2023
2 parents bec9595 + 0613fbd commit 2b12792
Show file tree
Hide file tree
Showing 72 changed files with 1,555 additions and 534 deletions.
2 changes: 1 addition & 1 deletion .ddev/config.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: foia-api
type: drupal9
docroot: docroot
php_version: "8.0"
php_version: "8.1"
webserver_type: nginx-fpm
router_http_port: "80"
router_https_port: "443"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-to-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.0'
php-version: '8.1'
- name: Install SSH key
uses: webfactory/[email protected]
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-to-production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.0'
php-version: '8.1'
- name: Install SSH key
uses: webfactory/[email protected]
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-to-staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.0'
php-version: '8.1'
- name: Install SSH key
uses: webfactory/[email protected]
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-to-uat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.0'
php-version: '8.1'
- name: Install SSH key
uses: webfactory/[email protected]
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-pull-requests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.0'
php-version: '8.1'
- name: Set up ddev
uses: ddev/github-action-setup-ddev@v1
- name: Set up the site
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,4 @@ As an alternative to Drupal VM, Docker can be used to spin up this project.

* [Issue queue](https://github.com/18F/beta.foia.gov/issues)
* [GitHub](https://github.com/usdoj/foia)

10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"php": ">=8.0",
"php": ">=8.1",
"ext-dom": "*",
"acquia/blt": "^13.4.0",
"acquia/blt-simplesamlphp": "^1.0",
Expand All @@ -25,9 +25,9 @@
"drupal/cog": "^1.15",
"drupal/config_split": "^1.7.0",
"drupal/core": "^9.5.8",
"drupal/core-composer-scaffold": "^9.5.8",
"drupal/core-project-message": "^9.5.8",
"drupal/core-recommended": "^9.5.8",
"drupal/core-composer-scaffold": "9.5.11",
"drupal/core-project-message": "9.5.11",
"drupal/core-recommended": "9.5.11",
"drupal/devel": "^5.0.2",
"drupal/entity_clone": "^2.0@beta",
"drupal/entity_embed": "^1.0",
Expand Down Expand Up @@ -206,7 +206,7 @@
"drupal/core-project-message": true
},
"platform": {
"php": "8.0.24"
"php": "8.1"
}
},
"autoload": {
Expand Down
Loading

0 comments on commit 2b12792

Please sign in to comment.