From d42f2227d7ad979f1cac22f2f97446c555731737 Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sun, 15 Aug 2021 16:31:31 +0200 Subject: [PATCH 1/2] Fix references to the CMS staging branch --- README.md | 4 ++-- RoboFile.dist.ini | 2 +- RoboFile.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 8f114ee..a881583 100644 --- a/README.md +++ b/README.md @@ -221,7 +221,7 @@ skipClone = false cmsPath = tests/joomla-cms3 ; If you want to clone a different branch, you can set it here -branch = staging +branch = 3.10-dev ; (Linux / Mac only) If you want to set a different owner for the CMS root folder, you can set it here. localUser = @@ -264,7 +264,7 @@ The currently available options are as follows: * `skipClone`: set to `true` to avoid the cms repo being deleted and re-cloned at each test execution. Useful to save time and bandwidth while you're debugging your test environment. But please be aware that if you don't refresh the repo you'll have to manually check the `installation` folder is present and the `configuration.php` is not. * `cmsPath`: set to the local path (absolute or relative) where you'd like the test website to be installed. Default is `tests/joomla-cms3`. -* `branch`: set to whatever existing branch from the `joomla-cms` project if you want to clone that specific branch. Default is `staging`. +* `branch`: set to whatever existing branch from the `joomla-cms` project if you want to clone that specific branch. Default is `3.10-dev`. ## Additional options diff --git a/RoboFile.dist.ini b/RoboFile.dist.ini index bca9b64..aeffe3b 100644 --- a/RoboFile.dist.ini +++ b/RoboFile.dist.ini @@ -7,7 +7,7 @@ skipClone = false cmsPath = tests/joomla ; If you want to clone a different branch, you can set it here -branch = staging +branch = 3.10-dev ; (Linux / Mac only) If you want to set a different owner for the CMS root folder, you can set it here. localUser = www-data diff --git a/RoboFile.php b/RoboFile.php index dd85b57..31ba1bd 100644 --- a/RoboFile.php +++ b/RoboFile.php @@ -398,7 +398,7 @@ class RoboFile extends Tasks */ private function buildGitCloneCommand() { - $branch = empty($this->configuration->branch) ? 'staging' : $this->configuration->branch; + $branch = empty($this->configuration->branch) ? '3.10-dev' : $this->configuration->branch; return "git" . $this->executableExtension . " clone -b $branch --single-branch --depth 1 https://github.com/joomla/joomla-cms.git tests/cache"; } From 29ca3c8d5293d93d90563448f1eb6cee2755519b Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Sun, 15 Aug 2021 16:49:31 +0200 Subject: [PATCH 2/2] Fix wrong default path in documentation --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a881583..f7c044f 100644 --- a/README.md +++ b/README.md @@ -258,7 +258,7 @@ The tests in Weblinks Extension use Codeception Testing Framework, if you want t This is not required, and if in doubt you can just skip this section, but there may be some specific use cases when you need (or want) to override the default behaviour of RoboFile.php. To do this, copy `RoboFile.dist.ini` to `RoboFile.ini` and add options in INI format, one per line, e.g. skipClone = true - cmsPath = tests/joomla-cms3 + cmsPath = tests/joomla The currently available options are as follows: