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

NEW Use supported modules repo for branch-based logic #35

Conversation

GuySartorelli
Copy link
Member

@GuySartorelli GuySartorelli commented Apr 30, 2024

@GuySartorelli GuySartorelli marked this pull request as draft April 30, 2024 00:48
@GuySartorelli GuySartorelli force-pushed the pulls/1/use-supported-modules-repo branch 7 times, most recently from f80c990 to 0048b55 Compare May 2, 2024 03:57
Comment on lines +23 to +27
if ($composerJson) {
file_put_contents('__composer.json', $composerJson);
}
file_put_contents('__branches.json', $branchesJson);
file_put_contents('__tags.json', $tagsJson);
Copy link
Member Author

Choose a reason for hiding this comment

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

Putting the files there means we don't have a separate code path for tests than we do for normal execution. This is the same as how we handle composer.json data in the generate-matrix tests.

@GuySartorelli GuySartorelli force-pushed the pulls/1/use-supported-modules-repo branch 2 times, most recently from 87d51fd to 8e2dc8a Compare May 3, 2024 00:31
composer.json Outdated
Comment on lines 2 to 7
"require-dev": {
"phpunit/phpunit": "^9.6"
},
"require": {
"silverstripe/supported-modules": "dev-pulls/main/combine-all-versions"
},
"repositories": {
"silverstripe/supported-modules": {
"type": "vcs",
"url": "git@github.com:creative-commoners/supported-modules.git"
}
}
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
"require-dev": {
"phpunit/phpunit": "^9.6"
},
"require": {
"silverstripe/supported-modules": "dev-pulls/main/combine-all-versions"
},
"repositories": {
"silverstripe/supported-modules": {
"type": "vcs",
"url": "git@github.com:creative-commoners/supported-modules.git"
}
}
"require": {
"silverstripe/supported-modules": "dev-main"
},
"require-dev": {
"phpunit/phpunit": "^9.6"
}

Copy link
Member Author

Choose a reason for hiding this comment

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

Yup, that'll be done once the PR for that fork is merged, so we can easily rerun CI here against that PR to see it go green if changes are needed over there.

Copy link
Member Author

Choose a reason for hiding this comment

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

Done now that the fork PR is merged and the repo is in packagist.

@GuySartorelli GuySartorelli force-pushed the pulls/1/use-supported-modules-repo branch from 8e2dc8a to 376a983 Compare May 6, 2024 21:48
@GuySartorelli GuySartorelli marked this pull request as ready for review May 6, 2024 21:48
@emteknetnz emteknetnz merged commit 1f5be97 into silverstripe:1 May 6, 2024
4 checks passed
@emteknetnz emteknetnz deleted the pulls/1/use-supported-modules-repo branch May 6, 2024 23:24
@emteknetnz
Copy link
Member

@GuySartorelli Remember to create a new minor branch and manually tag

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