Skip to content

Cleanup ci env #913

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asbiin merged 6 commits into from
Feb 19, 2018
Merged

Cleanup ci env #913

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b2325fa
move scripts
asbiin Feb 18, 2018
2d9ad4e
Remove executable bit
asbiin Feb 18, 2018
4c05f67
update
asbiin Feb 18, 2018
c52565a
update
asbiin Feb 18, 2018
e37c362
Fix paths
asbiin Feb 18, 2018
fffac8d
Merge branch 'master' into cleanup-ci-env
asbiin Feb 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix paths
  • Loading branch information
@asbiin
asbiin committed Feb 18, 2018
commit e37c36282d160ba74c42f32585b9c4adfb68e825
11 changes: 9 additions & 2 deletions .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
.gitignore
**/.gitignore
**/.gitkeep
.ci/
bootstrap/cache/*
.env
CODE_OF_CONDUCT.md
CONTRIBUTING.md
Expand All @@ -17,7 +17,7 @@ Homestead.yaml
node_modules/
npm-debug.log*
persist/
phpunit.xml
phpunit*
Procfile
public/storage/
resources/vendor/
Expand All @@ -27,6 +27,13 @@ scripts/tests
scripts/vagrant
server.php
sonar-project.properties
storage/app/public/*
storage/debugbar/*
storage/framework/cache/*
storage/framework/sessions/*
storage/framework/views/*
storage/logs/*
.styleci.yml
tests/
.travis.yml*
vendor/
2 changes: 1 addition & 1 deletion scripts/tests/runtests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set -evuo pipefail

SELF_PATH=$(cd -P -- "$(dirname -- "$0")" && /bin/pwd -P)
ROOT=$(realpath $SELF_PATH/..)
ROOT=$(realpath $SELF_PATH/../..)
HOST=localhost

$SELF_PATH/start-selenium.sh
Expand Down
2 changes: 1 addition & 1 deletion scripts/tests/server-cc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
/** Coverage files destination. */
const STORAGE = '/results/coverage';

$root = realpath(__DIR__.'/../');
$root = realpath(__DIR__.'/../../');

$uri = urldecode(
parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)
Expand Down
2 changes: 1 addition & 1 deletion scripts/tests/start-selenium.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ realpath ()
set -evuo pipefail

SELF_PATH=$(cd -P -- "$(dirname -- "$0")" && /bin/pwd -P)
ROOT=$(realpath $SELF_PATH/..)
ROOT=$(realpath $SELF_PATH/../..)

if [ -z "${DISPLAY:-}" ]; then
echo Start Xvfb;
Expand Down