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.

Sign up for GitHub

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

Prep 3.6.0 release. #113

Merged
merged 14 commits into from
Oct 3, 2024
+7 −7
Merged

Prep 3.6.0 release. #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9c6c2dc
Update composer.10.json
steveworley Sep 17, 2024
d29192d
Remove PHP version in composer platform config.
sonnykt Sep 23, 2024
4a690d3
Merge pull request #108 from govCMS/feature/remove_php_version
steveworley Sep 23, 2024
711fa14
Added missing RESTY_RESOLVER env var.
stooit Sep 24, 2024
111fe07
Merge pull request #107 from govCMS/feat/php-83-install
steveworley Sep 25, 2024
b0cdf17
Merge pull request #109 from govCMS/fix/local-resolver
steveworley Sep 25, 2024
6f217db
[DEVOPS-631] Replace clamav vars with httpav's
yusufhm Oct 2, 2024
a2dadfc
Merge pull request #111 from govCMS/fix/DEVOPS-631-httpav-vars
steveworley Oct 3, 2024
3460e22
[GOVCMSD10-1102] Add plugin tbachert/spi to Scaffold
Oct 3, 2024
8dd6bd5
Update composer.10.json
Tara-Wij Oct 3, 2024
65d9ac5
Update composer.10.json
Tara-Wij Oct 3, 2024
28cc5c0
3.6.0 release.
stooit Oct 3, 2024
f434b88
Merge pull request #112 from Tara-Wij/GOVCMSD10-1102
stooit Oct 3, 2024
36e5504
Merge branch 'develop' into release/3.6.0
stooit Oct 3, 2024
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
2 changes: 1 addition & 1 deletion .version.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
# e.g. site audits, automated backups.
version: {{ GOVCMS_VERSION }}
type: {{ GOVCMS_TYPE }}
scaffold: 3.5.0
scaffold: 3.6.0
6 changes: 2 additions & 4 deletions composer.10.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@
"minimum-stability": "dev",
"prefer-stable": true,
"config": {
"platform": {
"php": "8.1"
},
"sort-packages": true,
"allow-plugins": {
"composer/installers": true,
Expand All @@ -36,7 +33,8 @@
"oomphinc/composer-installers-extender": true,
"phpstan/extension-installer": true,
"php-http/discovery": true,
"simplesamlphp/composer-module-installer": true
"simplesamlphp/composer-module-installer": true,
"tbachert/spi": true
}
},
"autoload": {
Expand Down
6 changes: 4 additions & 2 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ x-volumes-paas: &paas-volumes
- .:/app:delegated

x-environment: &default-environment
RESTY_RESOLVER: 8.8.8.8
STAGE_FILE_PROXY_URL: ${STAGE_FILE_PROXY_URL:-}
LAGOON_ENVIRONMENT_TYPE: ${LAGOON_ENVIRONMENT_TYPE:-}
LAGOON_PROJECT: *lagoon-project
Expand All @@ -37,8 +38,9 @@ x-environment: &default-environment
DRUPAL_SHIELD_PASS: ${DRUPAL_SHIELD_PASS:-}
GOVCMS_DEPLOY_WORKFLOW_CONFIG: ${GOVCMS_DEPLOY_WORKFLOW_CONFIG:-import}
GOVCMS_PREPARE_XML_SCRIPT: /app/vendor/bin/govcms-prepare-xml
CLAMAV_HOST: av
CLAMAV_MODE: daemon
HTTPAV_ENDPOINT: http://av:3993/scan
HTTPAV_RETURN_KEY: comodo
HTTP_PAYLOAD_KEY: malware

services:

Expand Down