ENH Update reference to supported modules data #45
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,7 @@ | ||
| <?php | ||
|
|
||
| use SilverStripe\SupportedModules\BranchLogic; | ||
| use SilverStripe\SupportedModules\MetaData; | ||
| use Symfony\Component\Console\Output\NullOutput; | ||
| use Symfony\Component\Console\Input\ArgvInput; | ||
| use Symfony\Component\Console\Style\SymfonyStyle; | ||
|
|
@@ -46,85 +48,6 @@ function write_file($path, $contents) | |
| info("Wrote to $path"); | ||
| } | ||
|
|
||
|
Comment on lines
-86
to
-93
There was a problem hiding this comment. The set of "extra" repos we're gonna end up with after this change is a lot bigger than we were getting before. I've added a note to silverstripe/.github#242 that when this gets run next we should take care to check if there's anything we want to skip and add an exclude list if there is. |
||
| /** | ||
| * Returns a list of all scripts files to run against a particular cms major version | ||
| */ | ||
|
|
@@ -349,85 +272,45 @@ function branch_to_checkout($branches, $defaultBranch, $currentBranch, $currentB | |
| } | ||
|
|
||
| /** | ||
| * Works out the current branch cms major version | ||
| */ | ||
| function current_branch_cms_major( | ||
| // this param is only used for unit testing | ||
| string $composerJson = '' | ||
| ) { | ||
| global $MODULE_DIR, $GITHUB_REF; | ||
|
|
||
| // This repo matches every major and matches start at the lowest - but we only want the highest stable. | ||
| if ($GITHUB_REF === 'silverstripe/silverstripe-simple') { | ||
| return MetaData::HIGHEST_STABLE_CMS_MAJOR; | ||
| } | ||
|
Comment on lines
-362
to
286
There was a problem hiding this comment. markdown-php-codesniffer will get correctly identified - but the theme still needs some help. |
||
|
|
||
| if ($composerJson) { | ||
| $contents = $composerJson; | ||
| } elseif (check_file_exists('composer.json')) { | ||
| $contents = read_file('composer.json'); | ||
| } | ||
| $composerJson = json_decode($contents); | ||
| if (is_null($composerJson)) { | ||
| $lastError = json_last_error(); | ||
| error("Could not parse from composer.json - last error was $lastError"); | ||
| } | ||
|
|
||
| $repoData = MetaData::getMetaDataForRepository($GITHUB_REF); | ||
| $branchMajor = ''; | ||
| // If we're running unit tests, $MODULE_DIR will be some fake value with causes errors here | ||
| if (!running_unit_tests()) { | ||
| $currentBranch = cmd('git rev-parse --abbrev-ref HEAD', $MODULE_DIR); | ||
| if (preg_match('#^(pulls/)?([0-9]+)(\.[0-9]+)?(/|$)#', $currentBranch, $matches)) { | ||
| $branchMajor = $matches[2]; | ||
| } | ||
| } | ||
| $cmsMajor = BranchLogic::getCmsMajor($repoData, $branchMajor, $composerJson, true); | ||
|
|
||
| if ($cmsMajor === '') { | ||
| // The supported modules metadata has a bunch of repos with no specific major version mapping. | ||
| // Just assume they're on the highest major in that case. | ||
| return MetaData::HIGHEST_STABLE_CMS_MAJOR; | ||
| } | ||
| return (string) $cmsMajor; | ||
| } | ||
|
|
@@ -445,13 +328,18 @@ function setup_directories($input, $dirs = [DATA_DIR, MODULES_DIR]) { | |
| } | ||
| } | ||
|
|
||
| function filtered_modules($cmsMajor, $input) | ||
| { | ||
| $repos = MetaData::removeReposNotInCmsMajor( | ||
| MetaData::getAllRepositoryMetaData(false), | ||
| $cmsMajor, | ||
| // For repositories that only have a single support branch such as gha-generate-matrix, only include | ||
| // them when updating the currently supported CMS major. | ||
| $cmsMajor === MetaData::HIGHEST_STABLE_CMS_MAJOR | ||
| ); | ||
|
|
||
| $modules = convert_repos_data_to_modules($repos); | ||
|
|
||
| if ($input->getOption('only')) { | ||
| $only = explode(',', $input->getOption('only')); | ||
| $modules = array_filter($modules, function ($module) use ($only) { | ||
|
|
@@ -466,3 +354,18 @@ function filtered_modules($cmsMajor, $input) { | |
| } | ||
| return $modules; | ||
| } | ||
|
|
||
| function convert_repos_data_to_modules(array $repos) | ||
| { | ||
| $modules = []; | ||
| foreach ($repos as $repo) { | ||
| $ghrepo = $repo['github']; | ||
| $modules[] = [ | ||
| 'ghrepo' => $ghrepo, | ||
| 'account' => explode('/', $ghrepo)[0], | ||
| 'repo' => explode('/', $ghrepo)[1], | ||
| 'cloneUrl' => "git@github.com:$ghrepo.git", | ||
| ]; | ||
| } | ||
| return $modules; | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All gha-* repos are in the workflow category, and nothing else is.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should revert this, this one is like is_module() where we're not using MetaData as source of truth. This function is specifically for gha repos, and the naming convention on gha- will always be there, though there is some chance someone will put in a non-gha workflow file in the workflow section of repositories.json.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The reason we're not using
MetaDatainis_module()is because there might be repositories in other categories which are also modules, so we need to fall back on composer.json values.This function is different. There's no need to fall back on anything, everything we need to know is in the
CATEGORY_WORKFLOWcategory. All of the repositories in that category are the "gha-*" repositories. Nothing else is in that category. This is robust, and is much better than checking against a naming convention.If they do that, they're doing the wrong thing.
The same can be said of naming conventions - there is a chance someone could make a workflow repository that doesn't follow the naming convention, or could make another repository that accidentally starts with "gha-".
Both of those are a low chance and aren't worth considering IMO.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For context, the whole reason that category even exists in the file is so you can tell if something's a gha repo by just checking if it's in that category.