diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 1653526..0000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,48 +0,0 @@ -defaults: &defaults - steps: - # common php steps - - run: echo "http://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories - - run: if [ -n "$ADD_PACKAGES" ]; then apk -U add $ADD_PACKAGES; fi; - - run: if [ -n "$ADD_MODULES" ]; then docker-php-ext-install $ADD_MODULES; fi; - - run: echo "date.timezone = UTC" >> $(php --ini |grep Scan |awk '{print $NF}')/timezone.ini - - run: curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer - - # pre-checkout steps - - # checkout - - checkout - - # post-checkout steps - - # run tests - - run: composer install -n --prefer-dist - - run: php vendor/phpunit/phpunit/phpunit -c phpunit.xml --log-junit /tmp/test-results/phpunit/junit.xml - - store_test_results: - path: /tmp/test-results - -version: 2 -jobs: - build-php80: - <<: *defaults - docker: - - image: php:8.0-alpine - build-php81: - <<: *defaults - docker: - - image: php:8.1-alpine - build-php82: - <<: *defaults - docker: - - image: php:8.2-alpine - build-php83: - <<: *defaults - docker: - - image: php:8.3-alpine -workflows: - version: 2 - build: - jobs: - - build-php80 - - build-php81 - - build-php82 -# - build-php83 diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml new file mode 100644 index 0000000..8bcaa73 --- /dev/null +++ b/.github/workflows/unit-test.yml @@ -0,0 +1,22 @@ +name: unit-test.yml +on: [ push ] + +jobs: + unit-test: + strategy: + matrix: + os: [ ubuntu-latest, windows-latest ] + php: [ '8.0', '8.1', '8.2', '8.3', '8.4' ] + + runs-on: ${{matrix.os}} + + steps: + - uses: actions/checkout@v4 + - uses: shivammathur/setup-php@v2 + with: + php-version: ${{matrix.php}} + coverage: xdebug + tools: composer, phpunit + - run: composer install -n --prefer-dist + - run: php vendor/phpunit/phpunit/phpunit -c phpunit.xml --coverage-clover=coverage.xml + - run: php vendor/bin/coverage-check coverage.xml 70 diff --git a/composer.json b/composer.json index a857a7f..479fb9b 100644 --- a/composer.json +++ b/composer.json @@ -39,7 +39,8 @@ "ext-xdebug": "*" }, "require-dev": { - "phpunit/phpunit": "9.5.*" + "phpunit/phpunit": "^9", + "rregeer/phpunit-coverage-check": "^0.3.1" }, "autoload": { "psr-4": { diff --git a/tests/CubexTest.php b/tests/CubexTest.php index 821a27f..9b663ee 100644 --- a/tests/CubexTest.php +++ b/tests/CubexTest.php @@ -395,6 +395,9 @@ public function testFromContext() public function testDir() { $cubex = $this->_cubex(); - self::assertEquals(__DIR__ . '/.cubex/', Cubex::dir($cubex->getContext())); + self::assertEquals( + __DIR__ . DIRECTORY_SEPARATOR . '.cubex' . DIRECTORY_SEPARATOR, + Cubex::dir($cubex->getContext()) + ); } }