Skip to content

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
skyzyx committed Jul 1, 2019
1 parent 683f2e8 commit 5ae7c94
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ all: psalm
./unify-static
./unify
./format-xml
find $$(dirname $$(pwd)) -maxdepth 2 -type f -name composer.json | xargs -I% dirname % | xargs -I% bash -c "echo % && cd % && composer update"
@ # find $$(dirname $$(pwd)) -maxdepth 2 -type f -name composer.json | xargs -I% dirname % | xargs -I% bash -c "echo % && cd % && composer update"

.PHONY: psalm
psalm:
Expand Down
32 changes: 32 additions & 0 deletions static/docker-compose.yml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,35 @@ services:
nofile:
soft: 65535
hard: 100000

#---------------------------------------------------------------------------

# Run the benchmarking test in Alpine Linux
benchmarks-74:
image: "simplepieng/benchmarks:7.4"
volumes:
- ./:/workspace
ulimits:
nofile:
soft: 65535
hard: 100000

# Run the test suite in Alpine Linux
tests-74:
image: "simplepieng/test-runner:7.4"
volumes:
- ./:/workspace
ulimits:
nofile:
soft: 65535
hard: 100000

# Run the test suite in Alpine Linux with Xdebug enabled for code coverage
coverage-74:
image: "simplepieng/test-coverage:7.4"
volumes:
- ./:/workspace
ulimits:
nofile:
soft: 65535
hard: 100000
6 changes: 5 additions & 1 deletion templates/Makefile-DOCKER_VARS.tmpl
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
PHP_LAST=7.2
PHP_CURR=7.3
PHP_NEXT=7.4

PHP_LAST_EXT_DATE=20170718
PHP_CURR_EXT_DATE=20180731
PHP_NEXT_EXT_DATE=20190529

BUILD_DOCKER=docker build --compress --force-rm --squash
BUILD_COMPOSE=docker-compose build --pull --compress --parallel

COMPOSE_72=tests-72 coverage-72
COMPOSE_73=tests-73 coverage-73
COMPOSE_74=tests-74

TEST_QUICK=tests-72 tests-73
TEST_QUICK=tests-72 tests-73 tests-74
TEST_COVER=coverage-72 coverage-73

IMAGES_72=simplepieng/base:$(PHP_LAST) simplepieng/test-coverage:$(PHP_LAST) simplepieng/test-runner:$(PHP_LAST)
IMAGES_73=simplepieng/base:$(PHP_CURR) simplepieng/test-coverage:$(PHP_CURR) simplepieng/test-runner:$(PHP_CURR)
IMAGES_74=simplepieng/base:$(PHP_NEXT) simplepieng/test-coverage:$(PHP_NEXT) simplepieng/test-runner:$(PHP_NEXT)
2 changes: 1 addition & 1 deletion unify-composer
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ foreach ($finder as $file) {
unset($merged['require']['skyzyx/utility-pack']);

// Do not include itself
if ('simplepie/utility-pack' === $json['name']) {
if (isset($json['name']) && 'simplepie/utility-pack' === $json['name']) {
unset($merged['require']['simplepie/utility-pack']);
}

Expand Down

0 comments on commit 5ae7c94

Please sign in to comment.