Skip to content

Commit

Permalink
General maintenance
Browse files Browse the repository at this point in the history
- Removed vagrant, added Docksal instead
- Added PHP 7.3 to the list of testing in travis
- Updated the composer.lock file to include dependencies for max. PHP 7.0
  • Loading branch information
camilo.sperberg committed Jun 5, 2019
1 parent a44d55f commit bb375cb
Show file tree
Hide file tree
Showing 12 changed files with 184 additions and 411 deletions.
3 changes: 3 additions & 0 deletions .docksal/commands/composer-update
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/usr/bin/env bash

fin composer update -o --prefer-dist
4 changes: 4 additions & 0 deletions .docksal/commands/run-tests
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env bash

rm -rf tests/report/
fin exec /usr/local/bin/phpdbg -qrr vendor/bin/phpunit
3 changes: 3 additions & 0 deletions .docksal/docksal.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
DOCKSAL_STACK=node
DOCROOT=examples
CLI_IMAGE='docksal/cli:2.6-php7.0'
1 change: 1 addition & 0 deletions .docksal/docksal.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
version: "2.1"
8 changes: 8 additions & 0 deletions .docksal/services/cli/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Use a stock Docksal image as the base
FROM docksal/cli:2.6-php7.0

# Install phpdbg extension for PHP
RUN set -xe; \
apt-get update >/dev/null; \
apt-get install php7.0-phpdbg >/dev/null </dev/null \
; \
6 changes: 1 addition & 5 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,10 @@
tests/ export-ignore
vendor/ export-ignore
logs/ export-ignore
.vagrant/ export-ignore
.docksal/ export-ignore

.git* export-ignore
.*.yml export-ignore
phpunit.xml.dist export-ignore

Vagrantfile export-ignore
composer-install.sh export-ignore
execute-tests.sh export-ignore

*.php diff=php
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ php:
- 7.0
- 7.1
- 7.2
- 7.3
matrix:
include:
- php: 7.0
env: dependencies=lowest
- php: 7.2
- php: 7.3
env: dependencies=highest
before_script:
- composer self-update -q
Expand Down
43 changes: 0 additions & 43 deletions VagrantProvisionScripts/base.sh

This file was deleted.

17 changes: 0 additions & 17 deletions Vagrantfile

This file was deleted.

3 changes: 0 additions & 3 deletions bin/composer-update.sh

This file was deleted.

4 changes: 0 additions & 4 deletions bin/run-tests.sh

This file was deleted.

Loading

0 comments on commit bb375cb

Please sign in to comment.