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

DEP Remove remaining cwp dependencies and code #55

Merged

Conversation

emteknetnz
Copy link
Member

@emteknetnz emteknetnz commented Feb 27, 2024

Issue silverstripe/.github#199

Requires silverstripe/silverstripe-versionfeed#101 to fix the recipe-contents blocks jobs, and will need to be merged up as that PR is targetting 4.13 and this is a 6 build

@emteknetnz emteknetnz force-pushed the pulls/6/remove-watea branch 2 times, most recently from a4a4842 to 85678c0 Compare February 27, 2024 02:55
@emteknetnz emteknetnz changed the title DEP Remove cwp themes DEP Remove remaining cwp dependencies and code Feb 27, 2024
Copy link
Member

Choose a reason for hiding this comment

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

This was here in part as a way to validate that environmentcheck is working in kitchen sink.
Please keep the top config (which doesn't actually depend on anything CWP related) and just rename it to not say "cwp".

Copy link
Member Author

Choose a reason for hiding this comment

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

Updated, though have removed the cwp-search bit since there's no CMS 6 module for that

Copy link
Member

@GuySartorelli GuySartorelli Mar 3, 2024

Choose a reason for hiding this comment

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

Good, that's what I intended by "keep the top config" - "do not keep the bottom config" was implied. 👍

Copy link
Member

Choose a reason for hiding this comment

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

Please just replace watea and starter with simple but otherwise keep this, unless an identical theme.yml is provided by one of kitchen sink's dependencies.

Copy link
Member Author

Choose a reason for hiding this comment

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

Updated

app/_config/versionfeed.yml Outdated Show resolved Hide resolved
composer.json Outdated
Comment on lines 52 to 54
"project-files": [
"app/*"
],
Copy link
Member

Choose a reason for hiding this comment

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

Need to keep this if we're keeping some of the above.

Copy link
Member Author

Choose a reason for hiding this comment

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

Updated

@emteknetnz emteknetnz force-pushed the pulls/6/remove-watea branch from c0fa387 to ab16e9b Compare March 3, 2024 23:32
Copy link
Member

@GuySartorelli GuySartorelli left a comment

Choose a reason for hiding this comment

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

LGTM

@GuySartorelli GuySartorelli merged commit 6de6537 into silverstripe:6 Mar 4, 2024
22 checks passed
@GuySartorelli GuySartorelli deleted the pulls/6/remove-watea branch March 4, 2024 00:01
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.

2 participants