Merge pull request #2108 from jim-parry/beta4-prep2

Update the starters
codeigniter4 · Jul 25, 2019 · fe233f0 · fe233f0
2 parents d6f64aa + 2b4e78c
commit fe233f0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/admin/release-framework b/admin/release-framework
@@ -12,7 +12,7 @@ git checkout $branch
 echo -e "${BOLD}Build the framework distributable${NORMAL}"
 
 echo -e "${BOLD}Copy the main files/folders...${NORMAL}"
-releasable='app docs public system writable contributing.md env license.txt spark tests/_support'
+releasable='app docs public system writable contributing.md env license.txt spark'
 for fff in $releasable ; do
     if [ -d "$fff" ] ; then
         rm -rf $fff
@@ -21,7 +21,11 @@ for fff in $releasable ; do
 done
 
 echo -e "${BOLD}Override as needed...${NORMAL}"
-cp -rf ${CI_DIR}/admin/framework/* .
+cprm -rf tests
+mkdir tests
+cp -rf ${CI_DIR}/tests/_support tests/
+
+ -rf ${CI_DIR}/admin/framework/* .
 
 #---------------------------------------------------
 # And finally, get ready for merging

diff --git a/admin/starter/composer.json b/admin/starter/composer.json
@@ -6,7 +6,7 @@
     "license": "MIT",
     "require": {
         "php": ">=7.2",
-        "codeigniter4/framework": "^4@alpha"
+        "codeigniter4/framework": "^4@beta"
     },
     "require-dev": {
         "mikey179/vfsstream": "1.6.*",