From b9dc82b8bd3ae46bdc20f8d008aa745d6a5babc2 Mon Sep 17 00:00:00 2001
From: Markus Heck <51326311+Glutamat42@users.noreply.github.com>
Date: Thu, 4 Apr 2024 00:31:23 +0200
Subject: [PATCH] Update moodle-ci.yml

---
 .github/workflows/moodle-ci.yml | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/moodle-ci.yml b/.github/workflows/moodle-ci.yml
index 16a4b84..2dc0f8a 100644
--- a/.github/workflows/moodle-ci.yml
+++ b/.github/workflows/moodle-ci.yml
@@ -132,11 +132,7 @@ jobs:
       - name: PHPUnit tests
         if: ${{ always() }}
         run: |
-          cd moodle
-          php -d pcov.enabled=1 -d pcov.directory=. vendor/bin/phpunit --coverage-text --configuration local/adler --testdox --coverage-clover local/adler/coverage.xml
-          # restore tests are randomly causing segfaults when run with moodle-plugin-ci, but run totally fine when run with phpunit directly
-          # https://github.com/moodlehq/moodle-plugin-ci/issues/204
-          # moodle-plugin-ci phpunit --fail-on-warning --coverage-clover --coverage-text -vvv
+          moodle-plugin-ci phpunit --fail-on-warning --coverage-clover --testdox --coverage-pcov --coverage-text -vvv
 
       - name: Coveralls upload
         continue-on-error: true
@@ -144,12 +140,13 @@ jobs:
           COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
         if: ${{ matrix.php == '8.1' && matrix.moodle-branch == 'MOODLE_401_STABLE' && matrix.database == 'mariadb' }}
         run: |
-          cd moodle
-          composer require --dev php-coveralls/php-coveralls
-          cd local/adler
-          # workaround for https://github.com/php-coveralls/php-coveralls/issues/358
-          unset GITHUB_ACTIONS  
-          php ../../vendor/bin/php-coveralls --coverage_clover=coverage.xml -v --json_path coveralls_upload.json --exclude-no-stmt
+          moodle-plugin-ci coveralls-upload
+          #cd moodle
+          #composer require --dev php-coveralls/php-coveralls
+          #cd local/adler
+          ## workaround for https://github.com/php-coveralls/php-coveralls/issues/358
+          #unset GITHUB_ACTIONS  
+          #php ../../vendor/bin/php-coveralls --coverage_clover=coverage.xml -v --json_path coveralls_upload.json --exclude-no-stmt
 #     There are no behat tests
 #      - name: Behat features
 #        if: ${{ always() }}