Skip to content

Commit 37c14b9

Browse files
More elaborate GH CI & remove Travis
1 parent 07f39f0 commit 37c14b9

File tree

6 files changed

+40
-46
lines changed

6 files changed

+40
-46
lines changed

.github/workflows/test.yml

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,24 @@ jobs:
1414

1515
steps:
1616
- uses: actions/checkout@v2
17-
- name: Run test suite
18-
run: make test
17+
18+
- name: Test PHP 8.1 & submit codecov
19+
run: make test PHP=8.1 UP=1 DOWN=0 && bash <(curl -s https://codecov.io/bash) && make down PHP=8.1
20+
21+
- name: Test PHP 8.0
22+
run: make test PHP=8.0
23+
24+
- name: Test PHP 7.4
25+
run: make test PHP=7.4
26+
27+
- name: Test PHP 7.3
28+
run: make test PHP=7.3
29+
30+
- name: Test PHP 7.2
31+
run: make test PHP=7.2
32+
33+
- name: Test PHP 7.1
34+
run: make test PHP=7.1
35+
36+
- name: Test PHP 5.6
37+
run: make test PHP=5.6

.travis.yml

Lines changed: 0 additions & 33 deletions
This file was deleted.

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ RUN apt-get update
88
RUN apt-get install -y zip unzip libzip-dev git
99
RUN docker-php-ext-install zip
1010
RUN docker-php-ext-install pcntl
11+
RUN pecl install xdebug || pecl install xdebug-2.7.2 || pecl install -f xdebug-2.5.5 && docker-php-ext-enable xdebug
1112
RUN curl -sS https://getcomposer.org/installer | php
1213
RUN mv composer.phar /usr/local/bin/composer
1314
RUN composer install

docker-compose.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ services:
88
- ./src:/var/www/src
99
- ./data:/var/www/data
1010
- ./tests:/var/www/tests
11+
- ./build:/var/www/build
1112
- ./phpunit.xml.dist:/var/www/phpunit.xml.dist
1213
'8.1':
1314
extends: php

makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ down:
1919

2020
test:
2121
[ $(UP) -eq 1 ] && make up || true
22-
$(eval cmd='docker-compose run $(PHP) vendor/bin/phpunit')
22+
$(eval cmd='docker-compose run $(PHP) env XDEBUG_MODE=coverage vendor/bin/phpunit')
2323
eval $(cmd); status=$$?; [ $(DOWN) -eq 1 ] && make down; exit $$status

phpunit.xml.dist

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit colors="true" bootstrap="tests/bootstrap.php">
3-
<testsuites>
4-
<testsuite name="Minify test suite">
5-
<directory suffix="Test.php">tests/css</directory>
6-
<directory suffix="Test.php">tests/js</directory>
7-
</testsuite>
8-
</testsuites>
9-
<logging>
10-
<log type="coverage-clover" target="build/logs/clover.xml"/>
11-
</logging>
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" bootstrap="tests/bootstrap.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
3+
<coverage>
4+
<include>
5+
<directory suffix=".php">src</directory>
6+
</include>
7+
<report>
8+
<clover outputFile="build/logs/clover.xml"/>
9+
</report>
10+
</coverage>
11+
<testsuites>
12+
<testsuite name="Minify test suite">
13+
<directory suffix="Test.php">tests/css</directory>
14+
<directory suffix="Test.php">tests/js</directory>
15+
</testsuite>
16+
</testsuites>
17+
<logging/>
1218
</phpunit>

0 commit comments

Comments
 (0)