Clean up

Signed-off-by: Côme Chilliet <[email protected]>
nextcloud · Jun 28, 2022 · 9028b19 · 9028b19
1 parent f1dbdbd
commit 9028b19
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 93 deletions.
diff --git a/.github/workflows/lint-eslint.yml b/.github/workflows/lint-eslint.yml
diff --git a/.github/workflows/oci.yml b/.github/workflows/oci.yml
@@ -43,11 +43,11 @@ jobs:
           extensions: ctype,curl,dom,fileinfo,gd,imagick,intl,json,mbstring,oci8,openssl,pdo_sqlite,posix,sqlite,xml,zip
           tools: phpunit:9
           coverage: none
+          ini-file: development
 
       - name: composer i
         run: |
           composer i
-          composer require --dev phpunit/phpunit
 
       - name: Set up Nextcloud
         run: |
@@ -57,4 +57,4 @@ jobs:
 
       - name: PHPUnit
         working-directory: tests
-        run: ../lib/composer/bin/phpunit --configuration phpunit-autotest.xml --group DB,SLOWDB
+        run: phpunit --configuration phpunit-autotest.xml --group DB,SLOWDB
diff --git a/.github/workflows/phpunit-custom.yml b/.github/workflows/phpunit-custom.yml
diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml
@@ -46,6 +46,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-versions }}
+          tools: phpunit
           extensions: mbstring, iconv, fileinfo, intl, mysql, pdo_mysql
           coverage: none
           update: true
@@ -54,7 +55,6 @@ jobs:
       - name: composer i
         run: |
           composer i
-          composer require --dev phpunit/phpunit
 
       - name: Set up Nextcloud
         env:
@@ -66,4 +66,4 @@ jobs:
 
       - name: PHPUnit
         working-directory: tests
-        run: ../lib/composer/bin/phpunit --configuration phpunit-autotest.xml
+        run: phpunit --configuration phpunit-autotest.xml