diff --git a/scaffold/gitignore/ddev.gitignore b/scaffold/gitignore/ddev.gitignore index a4fb5089..e609a9ca 100644 --- a/scaffold/gitignore/ddev.gitignore +++ b/scaffold/gitignore/ddev.gitignore @@ -4,3 +4,4 @@ ######## .ddev/config.local.yaml .ddev/commands/web/task +.ddev/.drianpipe-composer-cache diff --git a/tasks/test.yml b/tasks/test.yml index ea0c5a12..4872117b 100644 --- a/tasks/test.yml +++ b/tasks/test.yml @@ -186,8 +186,9 @@ tasks: desc: Checks for any untracked files in git cmds: - | - if [ "$(git status -s --ignore-submodules=dirty)" != "" ]; then - git status -s --ignore-submodules=dirty + # Ignore the .ddev folder as changes are made to this in order to run tests e.g. adding environment variables. + if [ "$(git status -s --ignore-submodules=dirty -- ':!.ddev')" != "" ]; then + git status -s --ignore-submodules=dirty -- ':!.ddev' echo "Untracked changes detected - please rectify or add the files to your .gitignore" exit 1 fi