diff --git a/admin/RELEASE.md b/admin/RELEASE.md index 647720f7ca2c..4116520297e9 100644 --- a/admin/RELEASE.md +++ b/admin/RELEASE.md @@ -124,6 +124,10 @@ the existing content. * Set the date to format `Release Date: January 31, 2021` * Update **phpdoc.dist.xml** with the new `CodeIgniter v4.x API` and `` + * Update **admin/starter/builds**: + * Set `define('LATEST_RELEASE', '^4.x')` + * Set `define('NEXT_MINOR', '4.y-dev')`. + * If the major version changes, you need to manually change to `define('NEXT_MINOR', '5.0-dev')`. * Commit the changes with `Prep for 4.x.x release` * [ ] Create a new PR from `release-4.x.x` to `develop`: * Title: `Prep for 4.x.x release` diff --git a/admin/prepare-release.php b/admin/prepare-release.php index 5d66a43b8c86..3817396f065f 100644 --- a/admin/prepare-release.php +++ b/admin/prepare-release.php @@ -24,6 +24,9 @@ function replace_file_content(string $path, string $pattern, string $replace): v $versionParts = explode('.', $version); $minor = $versionParts[0] . '.' . $versionParts[1]; +// Note: Major version will change someday (4.x..5.x) - update manually. +$nextMinor = $versionParts[0] . '.' . $versionParts[1] + 1; + // Creates a branch for release. system('git switch develop'); system('git branch -D release-' . $version); @@ -68,6 +71,18 @@ function replace_file_content(string $path, string $pattern, string $replace): v "Release Date: {$date}", ); +// Update appstarter/builds script +replace_file_content( + './admin/starter/builds', + '/define\(\'LATEST_RELEASE\', \'.*?\'\);/mu', + "define('LATEST_RELEASE', '^{$minor}');", +); +replace_file_content( + './admin/starter/builds', + '/define\(\'NEXT_MINOR\', \'.*?\'\);/mu', + "define('NEXT_MINOR', '{$nextMinor}-dev');", +); + // Commits system('git add -u'); system('git commit -m "Prep for ' . $version . ' release"'); diff --git a/admin/starter/builds b/admin/starter/builds index cc2ca0851ac7..330f684ffbbf 100755 --- a/admin/starter/builds +++ b/admin/starter/builds @@ -1,7 +1,9 @@ #!/usr/bin/env php `. + ************ Deprecations ************ diff --git a/user_guide_src/source/installation/installing_composer.rst b/user_guide_src/source/installation/installing_composer.rst index 00a978547fb8..ab24aeffadea 100644 --- a/user_guide_src/source/installation/installing_composer.rst +++ b/user_guide_src/source/installation/installing_composer.rst @@ -158,6 +158,8 @@ Folders in your project after set up: - app, public, tests, writable - vendor/codeigniter4/framework/system +.. _switch-to-dev-version: + Latest Dev ---------- @@ -169,6 +171,9 @@ The `development user guide `_ is Note that this differs from the released user guide, and will pertain to the develop branch explicitly. +.. note:: You should not rely on the version of the framework in your project + - the development code may contain an incorrect number. + Update for Latest Dev ^^^^^^^^^^^^^^^^^^^^^ @@ -188,15 +193,11 @@ files if necessary. Next Minor Version ^^^^^^^^^^^^^^^^^^ -If you want to use the next minor version branch, after using the ``builds`` command -edit **composer.json** manually. +If you want to use the next minor version branch: -If you try the ``4.8`` branch, change the version to ``4.8.x-dev``:: +.. code-block:: console - "require": { - "php": "^8.2", - "codeigniter4/codeigniter4": "4.8.x-dev" - }, + php builds next And run ``composer update`` to sync your vendor folder with the latest target build. Then, check the Upgrading Guide