From de66d656265919f48487333a845392c0f0ddfcca Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Wed, 8 May 2024 15:32:11 +1200 Subject: [PATCH] ENH Update reference to supported modules data --- README.md | 4 - composer.json | 1 + funcs_scripts.php | 44 ++++++--- funcs_utils.php | 191 ++++++++++----------------------------- labels_command.php | 5 +- run.php | 5 +- tests/FuncsUtilsTest.php | 2 + update_command.php | 10 +- 8 files changed, 94 insertions(+), 168 deletions(-) diff --git a/README.md b/README.md index 1ef6766..e635aa5 100644 --- a/README.md +++ b/README.md @@ -102,7 +102,3 @@ MS_GITHUB_TOKEN=abc123 php run.php labels --dry-run --only=silverstripe-config,s | --exclude=[modules] | Exclude the specified modules (without account prefix) separated by commas e.g. `silverstripe-mfa,silverstripe-totp` | | --dry-run | Do not update labels in GitHub, output to terminal only | | --no-delete | Do not delete `_data` directory before running | - -## Updating the tool when a new major version of CMS is updated - -Update the `CURRENT_CMS_MAJOR` constant in `run.php` diff --git a/composer.json b/composer.json index 88b0f89..b69a00d 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,7 @@ { "require": { "php": ">=8.1", + "silverstripe/supported-modules": "dev-main", "symfony/console": "^6.3", "symfony/process": "^6.3", "panlatent/cron-expression-descriptor": "^1" diff --git a/funcs_scripts.php b/funcs_scripts.php index db07ebb..dfe6d27 100644 --- a/funcs_scripts.php +++ b/funcs_scripts.php @@ -1,6 +1,7 @@ $ghrepo, - 'account' => explode('/', $ghrepo)[0], - 'repo' => explode('/', $ghrepo)[1], - 'cloneUrl' => "git@github.com:$ghrepo.git", - ]; - } - return $modules; -} - -/** - * Hardcoded list of non-supported, additional repositories to standardise (e.g. silverstripe/gha-*) - * - * Repositories in this list should only have a single supported major version - * This will only be included if the $cmsMajor is the CURRENT_CMS_MAJOR - */ -function extra_repositories() -{ - $importantRepos = [ - 'silverstripe/markdown-php-codesniffer', - 'silverstripe/silverstripe-standards', - 'silverstripe/documentation-lint', - 'silverstripe/.github', - ]; - $modules = []; - // iterating to page 10 will be enough to get all the repos well into the future - for ($i = 0; $i < 10; $i++) { - $path = "_data/extra_repositories-$i.json"; - if (file_exists($path)) { - info("Reading local data from $path"); - $json = json_decode(file_get_contents($path), true); - } else { - $json = github_api("https://api.github.com/orgs/silverstripe/repos?per_page=100&page=$i"); - file_put_contents($path, json_encode($json, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT)); - } - if (empty($json)) { - break; - } - foreach ($json as $repo) { - if ($repo['archived']) { - continue; - } - $ghrepo = $repo['full_name']; - // Only include repos we care about - if (!in_array($ghrepo, $importantRepos) && strpos($ghrepo, '/gha-') === false) { - continue; - } - $modules[] = [ - 'ghrepo' => $ghrepo, - 'account' => explode('/', $ghrepo)[0], - 'repo' => explode('/', $ghrepo)[1], - 'cloneUrl' => "git@github.com:$ghrepo.git", - ]; - } - } - return $modules; -} - /** * Returns a list of all scripts files to run against a particular cms major version */ @@ -349,83 +272,41 @@ function branch_to_checkout($branches, $defaultBranch, $currentBranch, $currentB } /** - * Uses composer.json to workout the current branch cms major version - * - * If composer.json does not exist then it's assumed to be CURRENT_CMS_MAJOR + * 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; + global $MODULE_DIR, $GITHUB_REF; - // Some repositories don't have a valid matching CMS major - $ignoreCMSMajor = [ - '/silverstripe-simple', - '/markdown-php-codesniffer', - ]; - foreach ($ignoreCMSMajor as $ignore) { - if (strpos($MODULE_DIR, $ignore) !== false) { - return CURRENT_CMS_MAJOR; - } + // 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; } if ($composerJson) { $contents = $composerJson; } elseif (check_file_exists('composer.json')) { $contents = read_file('composer.json'); - } else { - return CURRENT_CMS_MAJOR; - } - - // special logic for developer-docs - if (strpos($MODULE_DIR, '/developer-docs') !== false) { - $currentBranch = cmd('git rev-parse --abbrev-ref HEAD', $MODULE_DIR); - if (!preg_match('#^(pulls/)?([0-9]+)(\.[0-9]+)?(/|$)#', $currentBranch, $matches)) { - error("Could not work out current major for developer-docs from branch $currentBranch"); - } - return $matches[2]; } - - $json = json_decode($contents); - if (is_null($json)) { + $composerJson = json_decode($contents); + if (is_null($composerJson)) { $lastError = json_last_error(); error("Could not parse from composer.json - last error was $lastError"); } - $matchedOnBranchThreeLess = false; - $version = preg_replace('#[^0-9\.]#', '', $json->require->{'silverstripe/framework'} ?? ''); - if (!$version) { - $version = preg_replace('#[^0-9\.]#', '', $json->require->{'silverstripe/cms'} ?? ''); - } - if (!$version) { - $version = preg_replace('#[^0-9\.]#', '', $json->require->{'silverstripe/mfa'} ?? ''); - } - if (!$version) { - $version = preg_replace('#[^0-9\.]#', '', $json->require->{'silverstripe/assets'} ?? ''); - if ($version) { - $matchedOnBranchThreeLess = true; - } - } - if (!$version) { - $version = preg_replace('#[^0-9\.]#', '', $json->require->{'cwp/starter-theme'} ?? ''); - if ($version) { - $version += 1; - } - } - $cmsMajor = ''; - if (preg_match('#^([0-9]+)+\.?[0-9]*$#', $version, $matches)) { - $cmsMajor = $matches[1]; - if ($matchedOnBranchThreeLess) { - $cmsMajor += 3; - } - } else { - $phpVersion = $json->require->{'php'} ?? ''; - if (substr($phpVersion,0, 4) === '^7.4') { - $cmsMajor = 4; - } elseif (substr($phpVersion,0, 4) === '^8.1') { - $cmsMajor = 5; + + $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 === '') { error('Could not work out what the current CMS major version is'); } @@ -445,13 +326,18 @@ function setup_directories($input, $dirs = [DATA_DIR, MODULES_DIR]) { } } -function filtered_modules($cmsMajor, $input) { - $modules = supported_modules($cmsMajor); - if ($cmsMajor === CURRENT_CMS_MAJOR) { - // only include extra_repositories() when using the current CMS major version because the extra rexpositories - // don't have multi majors branches supported e.g. gha-generate-matrix - $modules = array_merge($modules, extra_repositories()); - } +function filtered_modules($cmsMajor, $input) +{ + $repos = MetaData::removeReposNotInCmsMajor( + MetaData::getAllRepositoryMetaData(false), + $cmsMajor, + // This ensures that we only have one scenario that includes repositories which don't have + // multi major branches supported e.g. gha-generate-matrix + $cmsMajor === MetaData::HIGHEST_STABLE_CMS_MAJOR + ); + + $modules = reformat_repos_data($repos); + if ($input->getOption('only')) { $only = explode(',', $input->getOption('only')); $modules = array_filter($modules, function ($module) use ($only) { @@ -466,3 +352,18 @@ function filtered_modules($cmsMajor, $input) { } return $modules; } + +function reformat_repos_data(array $repos) +{ + $newFormatRepos = []; + foreach ($repos as $repo) { + $ghrepo = $repo['github']; + $newFormatRepos[] = [ + 'ghrepo' => $ghrepo, + 'account' => explode('/', $ghrepo)[0], + 'repo' => explode('/', $ghrepo)[1], + 'cloneUrl' => "git@github.com:$ghrepo.git", + ]; + } + return $newFormatRepos; +} diff --git a/labels_command.php b/labels_command.php index 3f10406..5aeb6cd 100644 --- a/labels_command.php +++ b/labels_command.php @@ -1,5 +1,6 @@ assertSame($expected, $actual); } diff --git a/update_command.php b/update_command.php index aabb8ac..da64500 100644 --- a/update_command.php +++ b/update_command.php @@ -1,5 +1,6 @@ getOption('cms-major') ?: CURRENT_CMS_MAJOR; + $cmsMajor = $input->getOption('cms-major') ?: MetaData::HIGHEST_STABLE_CMS_MAJOR; // modules $modules = filtered_modules($cmsMajor, $input); @@ -45,6 +46,7 @@ $repo = $module['repo']; $cloneUrl = $module['cloneUrl']; $MODULE_DIR = MODULES_DIR . "/$repo"; + $GITHUB_REF = "$account/$repo"; // clone repo // always clone the actual remote even when doing update-prs even though this is slower // reason is because we read origin in .git/config to workout the actual $account in @@ -83,7 +85,7 @@ $branchToCheckout = $allBranches[0]; $branchToCheckout = preg_replace('#^pr\-remote/#', '', $branchToCheckout); $prBranch = $branchToCheckout; - $allPRs = github_api("https://api.github.com/repos/$account/$repo/pulls?per_page=100"); + $allPRs = github_api("https://api.github.com/repos/$GITHUB_REF/pulls?per_page=100"); $allPRs = array_filter($allPRs, function($pr) use($prBranch) { return $pr['title'] === PR_TITLE && $pr['head']['ref'] === $prBranch && $pr['state'] === 'open'; }); @@ -189,7 +191,7 @@ // create pull-request using github api if (!$input->getOption('update-prs')) { // https://docs.github.com/en/rest/pulls/pulls?apiVersion=2022-11-28#create-a-pull-request - $responseJson = github_api("https://api.github.com/repos/$account/$repo/pulls", [ + $responseJson = github_api("https://api.github.com/repos/$GITHUB_REF/pulls", [ 'title' => PR_TITLE, 'body' => PR_DESCRIPTION, 'head' => "$prAccount:$prBranch",