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

Stop gitignoring most config.*.yaml, fixes #4893 #4923

Merged
merged 2 commits into from
May 19, 2023

Conversation

rfay
Copy link
Member

@rfay rfay commented May 17, 2023

The Issue

Most teams want config.*.yaml committed, and add-ons reinforce this.

How This PR Solves The Issue

Start gitignoring only config.local.yaml

Manual Testing Instructions

ddev config and ddev start a project. Get an add-on. git status should show config.*.yaml.

Release/Deployment Notes

This needs release note about the change.

@github-actions
Copy link

@rfay rfay marked this pull request as ready for review May 18, 2023 02:43
@rfay rfay requested review from a team as code owners May 18, 2023 02:43
@tyler36
Copy link
Collaborator

tyler36 commented May 18, 2023

Fixes #4893 for me.

DDEV: ddev version v1.22.0-alpha2-65-g7a34932c

Test

  1. Create new project.

    mkdir my-app
    cd my-app
  2. Add version control.

    git init
  3. Add DDEV to project.

    ddev config
  4. Add addon with config

    ddev get ddev/ddev-selenium-standalone-chrome
  5. Required addon files are available to commit.

    • .ddev/docker-compose.selenium-chrome.yaml
    • .ddev/config.selenium-standalone-chrome.yaml

@tyler36
Copy link
Collaborator

tyler36 commented May 18, 2023

Thank you.

Adding config.local.yaml should also be really helpful for teams. I know I like to keep a static DB port for my "main" projects so I don't have to keep updating my database viewer config.

Copy link
Member

@gilbertsoft gilbertsoft left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.

Just a note, I'm fine with the change. What about also ignoring config.override.yaml because it was suggested to use in the past? Would be less breaking.

@rfay
Copy link
Member Author

rfay commented May 18, 2023

@gilbertsoft I'd like people to completely forget about config.override.yaml, in fact, that feature should be removed now that we have actual overriding.

@rfay rfay merged commit 0dd6015 into ddev:master May 19, 2023
18 checks passed
@rfay rfay deleted the 20230517_gitignore branch May 19, 2023 13:03
@mattstein mattstein removed the request for review from a team May 19, 2023 15:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants