Skip to content

Commit 620d4d6

Browse files
DawoudIOclaude
andcommitted
chore: standardize dev environments ahead of DDEV support (PR #8089)
- Pin mariadb:10.11 in docker/docker-compose.yaml (matches DDEV config) - Update devcontainer PHP 8.2 → 8.4 (matches GH Actions and DDEV) - Use composer install instead of update in devcontainer init.sh - Exclude .ddev/** from CI paths-ignore in both workflow files Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent ff13cb9 commit 620d4d6

File tree

5 files changed

+8
-5
lines changed

5 files changed

+8
-5
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ChurchCRM Development",
3-
"image": "mcr.microsoft.com/devcontainers/php:8.2-bullseye",
3+
"image": "mcr.microsoft.com/devcontainers/php:8.4-bullseye",
44
"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
55
"shutdownAction": "none",
66

.devcontainer/init.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,7 @@ cd src
7777
if ! composer validate --no-check-publish 2>/dev/null; then
7878
echo "WARNING: composer.json validation warning (non-critical)"
7979
fi
80-
# Use composer update on first setup to sync lock file with composer.json
81-
composer update --no-dev --no-interaction --prefer-dist
80+
composer install --no-dev --no-interaction --prefer-dist
8281
cd ..
8382
echo "✓ Composer dependencies installed"
8483

.github/workflows/build-test-package.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Build, Test and Package
22

33
on:
44
pull_request:
5-
branches:
5+
branches:
66
- master
77
- develop
88
- 'hotfix/**'
@@ -11,6 +11,7 @@ on:
1111
- 'docs/**'
1212
- 'LICENSE'
1313
- '.gitignore'
14+
- '.ddev/**'
1415
push:
1516
branches:
1617
- master
@@ -21,6 +22,7 @@ on:
2122
- 'docs/**'
2223
- 'LICENSE'
2324
- '.gitignore'
25+
- '.ddev/**'
2426

2527
jobs:
2628
build:

.github/workflows/ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,14 @@ on:
1111
- 'docs/**'
1212
- 'LICENSE'
1313
- '.gitignore'
14+
- '.ddev/**'
1415
pull_request:
1516
paths-ignore:
1617
- '**/*.md'
1718
- 'docs/**'
1819
- 'LICENSE'
1920
- '.gitignore'
21+
- '.ddev/**'
2022

2123
concurrency:
2224
group: ${{ github.workflow }}-${{ github.ref }}

docker/docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
services:
22
database:
33
profiles: [dev, test, ci]
4-
image: mariadb
4+
image: mariadb:10.11
55
ports:
66
- ${DATABASE_PORT:-3306}:3306
77
env_file:

0 commit comments

Comments
 (0)