mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-03-23 13:59:51 +01:00
Code Issues Releases Wiki Activity

Deactivated "stash" lock in GitPreparer

Browse Source 
The "stash" lock was used to shove .gitignore'd files under the rug
so that they would not interfere with a pure copy of the app.

Vendor files may be ignored in the app, so for performance, the
"stash" lock has been deactivated. Vendor files no longer need to
be downloaded each time the test runs.

The "commit" lock now includes all ignored files so that tests
are run with the files as they are.
This commit is contained in:
Deltik 2018-11-19 15:14:34 -06:00
parent 5c3e14f8d1
commit ffd27d2d80
No known key found for this signature in database
GPG Key ID: 1167C5F9C9897637
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/preparers/GitPreparer.php
View File

@ -32,7 +32,7 @@ class GitPreparer implements Preparer
touch(self::TEST_IN_PROGRESS_FILE);
$this->runCommand('git add -f '.escapeshellarg(self::TEST_IN_PROGRESS_FILE));
$this->runCommand('git add -A');
$this->runCommand('git add -A -f');
$commit_command = 'git commit -a --no-gpg-sign ' .
"-m '".self::TEST_IN_PROGRESS."! If test crashed, run `git log -1` for instructions' " .
@ -41,7 +41,7 @@ class GitPreparer implements Preparer
$unsetVcsInProgress_commands = [
'git reset --hard HEAD',
'git clean -fdx',
'git stash pop',
// 'git stash pop',
'git reset --mixed HEAD^',
'rm -fv '.escapeshellarg(self::TEST_IN_PROGRESS)
];
@ -50,7 +50,7 @@ class GitPreparer implements Preparer
$commit_command .= "-m ".escapeshellarg($command)." ";
}
$this->runCommand($commit_command);
$this->runCommand('git stash push --all -m '.escapeshellarg(self::TEST_IN_PROGRESS));
// $this->runCommand('git stash push --all -m '.escapeshellarg(self::TEST_IN_PROGRESS));
}
protected function isVcsInProgress($case = '')