Skip to content

Commit

Permalink
Fixed path checking on Windows #262
Browse files Browse the repository at this point in the history 
Turn off CI server by default
Changed CI server port
Removed left over from patch chain

Signed-off-by: Roland Dalmulder <contact@rolandd.com>
  • Loading branch information
@roland-d
roland-d committed Apr 4, 2020
1 parent 63d99d3 commit 5c6b278
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
6 changes: 4 additions & 2 deletions administrator/components/com_patchtester/PatchTester/Model/PullModel.php
View file
Expand Up @@ -426,6 +426,8 @@ static function ($composerFile) use (&$filesToCheck, $path) {
*/
private function checkFilesExist(array $files, string $path): bool
{
$path = Path::clean($path);

foreach ($files as $file)
{
if (is_array($file))
Expand Down Expand Up @@ -700,7 +702,7 @@ private function applyWithGitHub(int $id): bool
*
* @since 3.0.0
*/
protected function parseFileList(stdClass $files): array
private function parseFileList(array $files): array
{
$parsedFiles = array();

Expand Down Expand Up @@ -777,7 +779,7 @@ public function revert(int $id): bool
$params = ComponentHelper::getParams('com_patchtester');

// Decide based on repository settings whether patch will be applied through Github or CIServer
if (((bool) $params->get('ci_switch', 1) || $id === $this->getPatchChain($id)->insert_id))
if ((bool) $params->get('ci_switch', 1))
{
return $this->revertWithCIServer($id);
}
Expand Down
4 changes: 2 additions & 2 deletions administrator/components/com_patchtester/config.xml
View file
Expand Up @@ -106,15 +106,15 @@
label="COM_PATCHTESTER_FIELD_CI_SERVER_NAME"
description="COM_PATCHTESTER_FIELD_CI_SERVER_NAME_DESC"
autocomplete="off"
default="https://ci.joomla.org:444"
default="https://ci.joomla.org"
/>

<field
name="ci_switch"
type="list"
label="COM_PATCHTESTER_FIELD_CI_SERVER_SWITCH"
description="COM_PATCHTESTER_FIELD_CI_SERVER_SWITCH_DESC"
default="1"
default="0"
>
<option value="1">COM_PATCHTESTER_FIELD_CI_SERVER_SWITCH_OPTION_ON</option>
<option value="0">COM_PATCHTESTER_FIELD_CI_SERVER_SWITCH_OPTION_OFF</option>
Expand Down

11 comments on commit 5c6b278

@alikon
Copy link

@alikon alikon commented on 5c6b278 Apr 4, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so can we have a RC2 soon with this fix for having win10 users on the same boat ?
thank you in advance

@roland-d
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@alikon The release is already out and we cannot use the CI server for most patches.

@alikon
Copy link

@alikon alikon commented on 5c6b278 Apr 4, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe a naive question
but any way
why ?

@roland-d
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy/paste from the issue:
The reason we cannot use the CI server at this point is because the patches contains references to files that do not exist. As such it would break your installation. So if you see the message that the patch could not be applied because it may break your system. Please turn off the CI Integration.

@alikon
Copy link

@alikon alikon commented on 5c6b278 Apr 4, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

humm....
please forgive me
but i'm trying to put myself on a newbies perspective
and in that pants i cannot understand

@roland-d
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In very simple wording: CI server does not work at this point, we are working on it.

Or are you asking something else?

@alikon
Copy link

@alikon alikon commented on 5c6b278 Apr 4, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no
but maybe this could be a more informative message to the end user
i mean "we are working to improve it" part

@roland-d
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where do you want to show that?

@alikon
Copy link

@alikon alikon commented on 5c6b278 Apr 4, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i'm still convinced that the average jhon@doe user cannot understand this
but a the same time i don't have the right answer, maybe some docs page can help ?

@roland-d
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What problem are you trying to solve? I have no idea what you are talking about.

@alikon
Copy link

@alikon alikon commented on 5c6b278 Apr 4, 2020 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this error is not clear
what I should do when it happens ?
simply turn off CI server ?
again not too much clear in my humbly opinion

Please sign in to comment.