From 35e1bc51b5a830b7fce2a260806c5cd095dfcd1e Mon Sep 17 00:00:00 2001 From: Jim Parry <jim_parry@bcit.ca> Date: Sat, 1 Dec 2018 23:45:57 -0800 Subject: [PATCH 1/9] Fix docbot config & add caution --- admin/docbot | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/admin/docbot b/admin/docbot index 93ca28fb7c28..0d106547e606 100755 --- a/admin/docbot +++ b/admin/docbot @@ -1,8 +1,14 @@ #!/bin/bash -# Rebuild and deploy CodeIgniter4 user guide +# Rebuild and deploy CodeIgniter4 under-development user guide +# +# This is a quick way to test user guide changes, and if they +# look good, to push them to the gh-pages branch of the +# development repository. +# +# This is not meant for updating the "stable" user guide. -. config +UPSTREAM=https://github.com/bcit-ci/CodeIgniter4.git # Prepare the nested repo clone folder cd user_guide_src From 56bf38b9071cafac87419b9f5f3dbd2829f26a62 Mon Sep 17 00:00:00 2001 From: Jim Parry <jim_parry@bcit.ca> Date: Sat, 1 Dec 2018 23:54:43 -0800 Subject: [PATCH 2/9] Fix changelog rotation --- admin/release | 5 ++++- user_guide_src/source/changelogs/index.rst | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/admin/release b/admin/release index 39a32550bced..e5b0e3a95c12 100755 --- a/admin/release +++ b/admin/release @@ -61,7 +61,9 @@ sed -i "/Release Date/s/Not Released/$(date +'%B %d, %Y')/" user_guide_src/sourc sed -i "/|version|/s/|version|/${RELEASE}/" user_guide_src/source/changelogs/next.rst # establish version-specific changelog -mv user_guide_src/source/changelogs/next.rst user_guide_src/source/changelogs/${RELEASE}.rst +sed -i "|changelogs/next|s|changeslog/next|changelogs/v{$RELEASE}| user_guide_src/source/changelogs/index.rst +mv user_guide_src/source/changelogs/next.rst user_guide_src/source/changelogs/v${RELEASE}.rst +touch user_guide_src/source/changelogs/next.rst #--------------------------------------------------- # Setup the distribution folders @@ -101,6 +103,7 @@ cd user_guide_src rm -rf build/* echo -e "${BOLD}... HTML version${NORMAL}" make html +touch build/html/.nojekyll echo -e "${BOLD}... epub version${NORMAL}" make epub diff --git a/user_guide_src/source/changelogs/index.rst b/user_guide_src/source/changelogs/index.rst index ce7787146a7e..dc78ee1766e4 100644 --- a/user_guide_src/source/changelogs/index.rst +++ b/user_guide_src/source/changelogs/index.rst @@ -31,7 +31,7 @@ Release Date: November 30, 2018 - We welcome Natan Felles, from Brazil, to the code developer team. He has proven to be passionate, dedicated and thorough :) -:doc:`See all the changes. </changelogs/next>` +:doc:`See all the changes. </changelogs/v4.0.0-alpha.3>` Version 4.0.0-alpha.2 From 75eb1717efb44582cab7163a10d3f95096ed2b1b Mon Sep 17 00:00:00 2001 From: Jim Parry <jim_parry@bcit.ca> Date: Sun, 2 Dec 2018 00:01:23 -0800 Subject: [PATCH 3/9] Remember to commit the release branch --- admin/release | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/admin/release b/admin/release index e5b0e3a95c12..697218c7a72b 100755 --- a/admin/release +++ b/admin/release @@ -122,6 +122,11 @@ sed -i "11 G" $file sed -i "12 a :doc:\`See all the changes. </changelogs/next>\`" $file sed -i "13 G" $file +#--------------------------------------------------- +echo -e "${BOLD}Commit the release branch${NORMAL}" +git add . +git commit -S -m "Release ${RELEASE}" + #--------------------------------------------------- # Build the distributables From dadb413ef53d6ba06c5a331d9b71ec881c101d33 Mon Sep 17 00:00:00 2001 From: Jim Parry <jim_parry@bcit.ca> Date: Sun, 2 Dec 2018 00:02:13 -0800 Subject: [PATCH 4/9] Fix framework stability in app-starter --- admin/starter/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/starter/composer.json b/admin/starter/composer.json index 4f250a3812a3..5e6c9e1627d1 100644 --- a/admin/starter/composer.json +++ b/admin/starter/composer.json @@ -6,7 +6,7 @@ "license": "MIT", "require": { "php": ">=7.1", - "codeigniter4/framework": "^4", + "codeigniter4/framework": "^4@alpha", "ext-curl": "*", "ext-intl": "*", "kint-php/kint": "^2.1", From 57409e70bcb07ad53c0570411fa1e6163e93f2b6 Mon Sep 17 00:00:00 2001 From: Jim Parry <jim_parry@bcit.ca> Date: Sun, 2 Dec 2018 00:03:23 -0800 Subject: [PATCH 5/9] Fix the distribution pushes --- admin/release-deploy | 3 --- 1 file changed, 3 deletions(-) diff --git a/admin/release-deploy b/admin/release-deploy index f4fc8fd51974..4ec9be181ec5 100755 --- a/admin/release-deploy +++ b/admin/release-deploy @@ -22,17 +22,14 @@ git push ${CI_ORG}/CodeIgniter4 develop echo -e "${BOLD}Pushing to the user guide repository${NORMAL}" cd ${CI_DIR}/dist/userguide git push origin master -git push ${CI_ORG}/userguide master echo -e "${BOLD}Pushing to the framework repository${NORMAL}" cd ${CI_DIR}/dist/framework git push origin master -git push ${CI_ORG}/framework master echo -e "${BOLD}Pushing to the app starter repository${NORMAL}" cd ${CI_DIR}/dist/appstarter git push origin master -git push ${CI_ORG}/appstarter master cd ${CI_DIR} From ead68e921f222052b6c72f65a879bd704b3556eb Mon Sep 17 00:00:00 2001 From: Jim Parry <jim_parry@bcit.ca> Date: Sun, 2 Dec 2018 00:06:34 -0800 Subject: [PATCH 6/9] Add cuation to release-notes template --- admin/release-notes.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/admin/release-notes.bb b/admin/release-notes.bb index 2e1928602715..6147a011cde1 100755 --- a/admin/release-notes.bb +++ b/admin/release-notes.bb @@ -1,3 +1,5 @@ +CAUTION: THIS FILE IS A MIX OF BBCODE & MARKDOWN... NEEDS PROOFING + CodeIgniter-4.0.0-alpha.1 launches today, after a lengthy build-up :) Huge shoutout to Lonnie Ezell for all of his hard work getting the vision From 7cdc18bd2dbe6a3b013e7ed9f7f660e9ce765794 Mon Sep 17 00:00:00 2001 From: Jim Parry <jim_parry@bcit.ca> Date: Sun, 2 Dec 2018 00:14:39 -0800 Subject: [PATCH 7/9] Flush writable folder to avoid contamination --- admin/release | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/admin/release b/admin/release index 697218c7a72b..2c1fdff3518c 100755 --- a/admin/release +++ b/admin/release @@ -93,6 +93,15 @@ setup_repo framework setup_repo userguide setup_repo appstarter +#--------------------------------------------------- +# Housekeeping - make sure writable is flushed of test files +# at least, test files that crop up on my system :-/ +rm -f writable/cache/H* +rm -f writable/cache/d* +rm -f writable/cache/s* +rm -f writable/debugbar/debug* +rm -f writable/logs/log* + #--------------------------------------------------- # Generate the user guide echo -e "${BOLD}Generate the user guide${NORMAL}" From 3277198d54d679d9c27113ccc2d40c96d0ee528d Mon Sep 17 00:00:00 2001 From: Jim Parry <jim_parry@bcit.ca> Date: Sun, 2 Dec 2018 00:31:18 -0800 Subject: [PATCH 8/9] Next release changelog template --- admin/next.rst | 14 ++++++++++++++ admin/release | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 admin/next.rst diff --git a/admin/next.rst b/admin/next.rst new file mode 100644 index 000000000000..94e4dcad7f4c --- /dev/null +++ b/admin/next.rst @@ -0,0 +1,14 @@ +Version |version| +==================================================== + +Release Date: Not released + +**Next alpha release of CodeIgniter4** + + +The list of changed files follows, with PR numbers shown. + + +PRs merged: +----------- + diff --git a/admin/release b/admin/release index 2c1fdff3518c..4d67233a706e 100755 --- a/admin/release +++ b/admin/release @@ -56,7 +56,6 @@ sed -i "/Release Date/s/Not Released/$(date +'%B %d, %Y')/" user_guide_src/sourc sed -i "/|version|/s/|version|/${RELEASE}/" user_guide_src/source/changelogs/index.rst # version & date in user_guide_src/source/next.rst -sed -i "/|release|/s/|.*|/${RELEASE}/" user_guide_src/source/changelogs/next.rst sed -i "/Release Date/s/Not Released/$(date +'%B %d, %Y')/" user_guide_src/source/changelogs/next.rst sed -i "/|version|/s/|version|/${RELEASE}/" user_guide_src/source/changelogs/next.rst @@ -64,6 +63,7 @@ sed -i "/|version|/s/|version|/${RELEASE}/" user_guide_src/source/changelogs/nex sed -i "|changelogs/next|s|changeslog/next|changelogs/v{$RELEASE}| user_guide_src/source/changelogs/index.rst mv user_guide_src/source/changelogs/next.rst user_guide_src/source/changelogs/v${RELEASE}.rst touch user_guide_src/source/changelogs/next.rst +cp admin/next.rst user_guide_src/source/changelogs/next.rst #--------------------------------------------------- # Setup the distribution folders From b53574e7dfb4e0332234fee2ed8b32f7775de2e5 Mon Sep 17 00:00:00 2001 From: Jim Parry <jim_parry@bcit.ca> Date: Sun, 2 Dec 2018 00:42:39 -0800 Subject: [PATCH 9/9] Tidy up the next changelog template --- user_guide_src/source/changelogs/next.rst | 14 ++++++++++++++ .../{4.0.0-alpha.3.rst => v4.0.0-alpha.3.rst} | 0 2 files changed, 14 insertions(+) create mode 100644 user_guide_src/source/changelogs/next.rst rename user_guide_src/source/changelogs/{4.0.0-alpha.3.rst => v4.0.0-alpha.3.rst} (100%) diff --git a/user_guide_src/source/changelogs/next.rst b/user_guide_src/source/changelogs/next.rst new file mode 100644 index 000000000000..94e4dcad7f4c --- /dev/null +++ b/user_guide_src/source/changelogs/next.rst @@ -0,0 +1,14 @@ +Version |version| +==================================================== + +Release Date: Not released + +**Next alpha release of CodeIgniter4** + + +The list of changed files follows, with PR numbers shown. + + +PRs merged: +----------- + diff --git a/user_guide_src/source/changelogs/4.0.0-alpha.3.rst b/user_guide_src/source/changelogs/v4.0.0-alpha.3.rst similarity index 100% rename from user_guide_src/source/changelogs/4.0.0-alpha.3.rst rename to user_guide_src/source/changelogs/v4.0.0-alpha.3.rst