diff --git a/.drone.yml b/.drone.yml index 7bd213a042..2c77c667af 100644 --- a/.drone.yml +++ b/.drone.yml @@ -214,43 +214,6 @@ trigger: - pull_request - push ---- -kind: pipeline -name: sqlite - -steps: -- name: submodules - image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest - commands: - - git submodule update --init -- name: sqlite-php7.3 - image: ghcr.io/nextcloud/continuous-integration-php7.3:php7.3-6 - commands: - - bash tests/drone-run-php-tests.sh || exit 0 - - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite -- name: sqlite-php7.4 - image: ghcr.io/nextcloud/continuous-integration-php7.4:php7.4-3 - commands: - - bash tests/drone-run-php-tests.sh || exit 0 - - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite -- name: sqlite-php8.0 - image: ghcr.io/nextcloud/continuous-integration-php8.0:latest - commands: - - bash tests/drone-run-php-tests.sh || exit 0 - - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite - -services: -- name: cache - image: ghcr.io/nextcloud/continuous-integration-redis:latest - -trigger: - branch: - - master - - stable* - event: - - pull_request - - push - --- kind: pipeline name: mariadb10.1-php7.3 diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 59248238ba..2ac5fe39ac 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -7,6 +7,9 @@ on: - master - stable* +env: + php-extensions: ctype,curl,dom,fileinfo,gd,iconv,intl,json,mbstring,oci8,openssl,pdo_sqlite,posix,sqlite,xml,zip + jobs: phpunit-nodb: runs-on: ubuntu-20.04 @@ -22,7 +25,7 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-versions }} - extensions: ctype,curl,dom,fileinfo,gd,iconv,intl,json,mbstring,oci8,openssl,pdo_sqlite,posix,sqlite,xml,zip + extensions: ${{ env.php-extensions }} tools: phpunit:9.5.4 coverage: none - name: PHPUnit @@ -31,8 +34,31 @@ jobs: TEST_SELECTION: NODB run: bash autotest.sh sqlite + phpunit-sqlite: + runs-on: ubuntu-20.04 + strategy: + matrix: + php-versions: [ '7.3', '7.4', '8.0' ] + steps: + - name: Checkout server + uses: actions/checkout@v2 + with: + submodules: true + - name: Set up php ${{ matrix.php-versions }} + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php-versions }} + extensions: ${{ env.php-extensions }} + tools: phpunit:9.5.4 + coverage: none + - name: PHPUnit + env: + NOCOVERAGE: true + run: bash autotest.sh sqlite + phpunit-oci8: runs-on: ubuntu-20.04 + needs: phpunit-sqlite strategy: matrix: @@ -57,7 +83,7 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-versions }} - extensions: ctype,curl,dom,fileinfo,gd,iconv,intl,json,mbstring,oci8,openssl,pdo_sqlite,posix,sqlite,xml,zip + extensions: ${{ env.php-extensions }} tools: phpunit:8.5.2 coverage: none