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

API Update import() signature #74

Merged

Conversation

emteknetnz
Copy link
Member

@emteknetnz emteknetnz commented Dec 8, 2022

Fixes
- silverstripe/cms[5.0.0-alpha1, ..., 5.x-dev] require silverstripe/versioned ^2 -> found silverstripe/versioned[2.0.0-alpha1, 2.x-dev] but it conflicts with your root composer.json require (^1.12).

https://github.com/silverstripe/silverstripe-registry/actions/runs/3645000481/jobs/6154760365#step:9:277

Also updates RegistryAdmin::import() to be compatible with the updated signature on ModelAdmin::import()

Note: not fixing the ->addPlugin() CI failure - have raised a new issue for since it's not obvious what the fix here is since we may have lost functionality as part of the flysystem upgrade

Parent issue

@emteknetnz emteknetnz force-pushed the pulls/3/broken-builds branch 2 times, most recently from 4bae476 to 81ed54e Compare December 8, 2022 04:14
@emteknetnz emteknetnz changed the title FIX Use CMS 5 compatible version of versioned MNT Use CMS 5 compatible version of versioned Dec 8, 2022
@emteknetnz emteknetnz changed the title MNT Use CMS 5 compatible version of versioned API Update import() signature Dec 8, 2022
@emteknetnz emteknetnz force-pushed the pulls/3/broken-builds branch from 81ed54e to 1ff8d18 Compare December 8, 2022 04:15
@GuySartorelli GuySartorelli merged commit af1f85e into silverstripe:3 Dec 13, 2022
@GuySartorelli GuySartorelli deleted the pulls/3/broken-builds branch December 13, 2022 02:59
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