From 4e2311d45cb503b7af7e66fa2d0cded63711ac37 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Wed, 2 Jun 2021 22:56:33 +0200 Subject: [PATCH 01/11] Move NoDB PHPUnit to GitHub Actions Signed-off-by: Lukas Reschke --- .drone.yml | 37 ---------------------- .github/workflows/{oci.yml => phpunit.yml} | 31 ++++++++++++------ 2 files changed, 22 insertions(+), 46 deletions(-) rename .github/workflows/{oci.yml => phpunit.yml} (64%) diff --git a/.drone.yml b/.drone.yml index 8217524fbb..7bd213a042 100644 --- a/.drone.yml +++ b/.drone.yml @@ -214,43 +214,6 @@ trigger: - pull_request - push ---- -kind: pipeline -name: nodb - -steps: -- name: submodules - image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest - commands: - - git submodule update --init -- name: nodb-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=NODB ./autotest.sh sqlite -- name: nodb-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=NODB ./autotest.sh sqlite -- name: nodb-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=NODB ./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: sqlite diff --git a/.github/workflows/oci.yml b/.github/workflows/phpunit.yml similarity index 64% rename from .github/workflows/oci.yml rename to .github/workflows/phpunit.yml index 04d1dfdbab..40b16cf632 100644 --- a/.github/workflows/oci.yml +++ b/.github/workflows/phpunit.yml @@ -8,12 +8,30 @@ on: - stable* jobs: + phpunit-nodb: + 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: ctype,curl,dom,fileinfo,gd,iconv,intl,json,mbstring,oci8,openssl,pdo_sqlite,posix,sqlite,xml,zip + tools: phpunit:8.5.2 + coverage: none + - name: PHPUnit + run: NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite + phpunit-oci8: runs-on: ubuntu-20.04 strategy: - # do not stop on another job's failure - fail-fast: false matrix: php-versions: [ '7.4' ] databases: [ 'oci' ] @@ -29,13 +47,8 @@ jobs: steps: - name: Checkout server uses: actions/checkout@v2 - - - name: Checkout submodules - shell: bash - run: | - auth_header="$(git config --local --get http.https://github.com/.extraheader)" - git submodule sync --recursive - git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1 + with: + submodules: true - name: Set up php ${{ matrix.php-versions }} uses: shivammathur/setup-php@v2 From 559712d115aa21553c15b9f6fb9834dc3eeb7e57 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Wed, 2 Jun 2021 23:01:29 +0200 Subject: [PATCH 02/11] Use bash Signed-off-by: Lukas Reschke --- .github/workflows/phpunit.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 40b16cf632..544214e2ab 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -26,7 +26,10 @@ jobs: tools: phpunit:8.5.2 coverage: none - name: PHPUnit - run: NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite + env: + NOCOVERAGE: true + TEST_SELECTION: NODB + run: bash autotest.sh sqlite phpunit-oci8: runs-on: ubuntu-20.04 From bdcd32ac7ff797aa1af45765f95b8cc5c45ee78c Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Wed, 2 Jun 2021 23:04:21 +0200 Subject: [PATCH 03/11] Use phpunit 9.5.4 Signed-off-by: Lukas Reschke --- .github/workflows/phpunit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 544214e2ab..59248238ba 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -23,7 +23,7 @@ jobs: with: php-version: ${{ matrix.php-versions }} extensions: ctype,curl,dom,fileinfo,gd,iconv,intl,json,mbstring,oci8,openssl,pdo_sqlite,posix,sqlite,xml,zip - tools: phpunit:8.5.2 + tools: phpunit:9.5.4 coverage: none - name: PHPUnit env: From a93b6a9e32147b308a6a9d04e33baf57c1c6d87b Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Wed, 2 Jun 2021 23:14:14 +0200 Subject: [PATCH 04/11] WIP Signed-off-by: Lukas Reschke --- .drone.yml | 37 ----------------------------------- .github/workflows/phpunit.yml | 30 ++++++++++++++++++++++++++-- 2 files changed, 28 insertions(+), 39 deletions(-) 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 From 0acd7dc9339efac3d781b504d95179d48e4da31e Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Wed, 2 Jun 2021 23:34:04 +0200 Subject: [PATCH 05/11] WIP --- .github/workflows/phpunit.yml | 2 +- tests/lib/Avatar/GuestAvatarTest.php | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 2ac5fe39ac..8efdcbd3b9 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -8,7 +8,7 @@ on: - stable* env: - php-extensions: ctype,curl,dom,fileinfo,gd,iconv,intl,json,mbstring,oci8,openssl,pdo_sqlite,posix,sqlite,xml,zip + php-extensions: cli,ctype,curl,dom,fileinfo,gd,iconv,intl,json,ldap,mbstring,mysql,oci8,openssl,pdo_sqlite,pgsql,posix,redis,sqlite,xml,zip jobs: phpunit-nodb: diff --git a/tests/lib/Avatar/GuestAvatarTest.php b/tests/lib/Avatar/GuestAvatarTest.php index b8e6d8ae2e..7aa2da29eb 100644 --- a/tests/lib/Avatar/GuestAvatarTest.php +++ b/tests/lib/Avatar/GuestAvatarTest.php @@ -62,6 +62,8 @@ class GuestAvatarTest extends TestCase { * @return void */ public function testGet() { + $this->markTestSkipped('Test relies on PHP GD output.'); + $avatar = $this->guestAvatar->getFile(32); self::assertInstanceOf(InMemoryFile::class, $avatar); $expectedFile = file_get_contents( From 7f47c90f3707a757e3c782940250e1ab55a85f0c Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Wed, 2 Jun 2021 23:41:31 +0200 Subject: [PATCH 06/11] Redis --- .github/workflows/phpunit.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 8efdcbd3b9..854b129721 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -34,6 +34,17 @@ jobs: TEST_SELECTION: NODB run: bash autotest.sh sqlite + services: + redis: + image: redis + options: >- + --health-cmd "redis-cli ping" + --health-interval 10s + --health-timeout 5s + --health-retries 5 + ports: + - "6379:6379" + phpunit-sqlite: runs-on: ubuntu-20.04 strategy: From 9e68804049d824b5664e985a5e37dc2646f17627 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Thu, 3 Jun 2021 08:37:15 +0200 Subject: [PATCH 07/11] Format tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- .github/workflows/lint.yml | 12 ++++++++++-- .github/workflows/phpunit.yml | 20 +++++++++++++------- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 8fdd294800..1fa4f9c81b 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -3,29 +3,35 @@ on: pull_request jobs: php-linters: + name: php${{ matrix.php-versions }} lint runs-on: ubuntu-latest + strategy: matrix: php-versions: ['7.3', '7.4', '8.0'] - name: php${{ matrix.php-versions }} lint + steps: - name: Checkout uses: actions/checkout@master + - name: Set up php${{ matrix.php-versions }} uses: shivammathur/setup-php@master with: php-version: ${{ matrix.php-versions }} extensions: ctype,curl,dom,fileinfo,gd,iconv,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip coverage: none + - name: Lint run: composer run lint php-cs-fixer: name: php-cs check runs-on: ubuntu-latest + steps: - name: Checkout uses: actions/checkout@master + - name: Set up php uses: shivammathur/setup-php@master with: @@ -33,8 +39,10 @@ jobs: extensions: ctype,curl,dom,fileinfo,gd,iconv,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip coverage: none tools: cs2pr + - name: Install dependencies run: composer i + - name: Run coding standards check run: | composer run cs:check -- --format=checkstyle | cs2pr @@ -42,13 +50,13 @@ jobs: shell: bash node: + name: eslint node${{ matrix.node-version }} runs-on: ubuntu-latest strategy: matrix: node-version: [12.x] - name: eslint node${{ matrix.node-version }} steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 854b129721..f924d9b9e6 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -13,14 +13,17 @@ env: jobs: phpunit-nodb: runs-on: ubuntu-20.04 + strategy: matrix: - php-versions: [ '7.3', '7.4', '8.0' ] + 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: @@ -28,6 +31,7 @@ jobs: extensions: ${{ env.php-extensions }} tools: phpunit:9.5.4 coverage: none + - name: PHPUnit env: NOCOVERAGE: true @@ -47,14 +51,17 @@ jobs: phpunit-sqlite: runs-on: ubuntu-20.04 + strategy: matrix: - php-versions: [ '7.3', '7.4', '8.0' ] + 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: @@ -62,6 +69,7 @@ jobs: extensions: ${{ env.php-extensions }} tools: phpunit:9.5.4 coverage: none + - name: PHPUnit env: NOCOVERAGE: true @@ -69,14 +77,12 @@ jobs: phpunit-oci8: runs-on: ubuntu-20.04 - needs: phpunit-sqlite + # oci takes more time + needs: [phpunit-nodb, phpunit-sqlite] strategy: matrix: - php-versions: [ '7.4' ] - databases: [ 'oci' ] - - name: php${{ matrix.php-versions }}-${{ matrix.databases }} + php-versions: ["7.4"] services: oracle: From ada17934d845d8c7f1ae6a4ea37faa28fb4ee762 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Thu, 3 Jun 2021 08:37:20 +0200 Subject: [PATCH 08/11] Fix tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- tests/lib/AppFramework/Bootstrap/CoordinatorTest.php | 2 +- .../Bootstrap/RegistrationContextTest.php | 12 ------------ .../Middleware/Security/SecurityMiddlewareTest.php | 4 ++-- tests/lib/CapabilitiesManagerTest.php | 2 +- .../Collaboration/Resources/ProviderManagerTest.php | 4 ++-- 5 files changed, 6 insertions(+), 18 deletions(-) diff --git a/tests/lib/AppFramework/Bootstrap/CoordinatorTest.php b/tests/lib/AppFramework/Bootstrap/CoordinatorTest.php index 05442455cb..d6ceefa426 100644 --- a/tests/lib/AppFramework/Bootstrap/CoordinatorTest.php +++ b/tests/lib/AppFramework/Bootstrap/CoordinatorTest.php @@ -89,7 +89,7 @@ class CoordinatorTest extends TestCase { ->with(\OCA\Settings\AppInfo\Application::class) ->willThrowException(new QueryException("")); $this->logger->expects($this->once()) - ->method('logException'); + ->method('error'); $this->coordinator->bootApp($appId); } diff --git a/tests/lib/AppFramework/Bootstrap/RegistrationContextTest.php b/tests/lib/AppFramework/Bootstrap/RegistrationContextTest.php index f97ac92e88..26ddf14787 100644 --- a/tests/lib/AppFramework/Bootstrap/RegistrationContextTest.php +++ b/tests/lib/AppFramework/Bootstrap/RegistrationContextTest.php @@ -60,8 +60,6 @@ class RegistrationContextTest extends TestCase { $container->expects($this->once()) ->method('registerCapability') ->with($name); - $this->logger->expects($this->never()) - ->method('logException'); $this->context->for('myapp')->registerCapability($name); $this->context->delegateCapabilityRegistrations([ @@ -76,8 +74,6 @@ class RegistrationContextTest extends TestCase { $dispatcher->expects($this->once()) ->method('addServiceListener') ->with($event, $service, 0); - $this->logger->expects($this->never()) - ->method('logException'); $this->context->for('myapp')->registerEventListener($event, $service); $this->context->delegateEventListenerRegistrations($dispatcher); @@ -98,8 +94,6 @@ class RegistrationContextTest extends TestCase { $container->expects($this->once()) ->method('registerService') ->with($service, $factory, $shared); - $this->logger->expects($this->never()) - ->method('logException'); $this->context->for('myapp')->registerService($service, $factory, $shared); $this->context->delegateContainerRegistrations([ @@ -117,8 +111,6 @@ class RegistrationContextTest extends TestCase { $container->expects($this->once()) ->method('registerAlias') ->with($alias, $target); - $this->logger->expects($this->never()) - ->method('logException'); $this->context->for('myapp')->registerServiceAlias($alias, $target); $this->context->delegateContainerRegistrations([ @@ -136,8 +128,6 @@ class RegistrationContextTest extends TestCase { $container->expects($this->once()) ->method('registerParameter') ->with($name, $value); - $this->logger->expects($this->never()) - ->method('logException'); $this->context->for('myapp')->registerParameter($name, $value); $this->context->delegateContainerRegistrations([ @@ -154,8 +144,6 @@ class RegistrationContextTest extends TestCase { $container->expects($this->once()) ->method('registerMiddleware') ->with($name); - $this->logger->expects($this->never()) - ->method('logException'); $this->context->for('myapp')->registerMiddleware($name); $this->context->delegateMiddlewareRegistrations([ diff --git a/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php index 076f6588d9..8f55f90d37 100644 --- a/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php @@ -506,7 +506,7 @@ class SecurityMiddlewareTest extends \Test\TestCase { ->willReturn('http://localhost/nextcloud/index.php/login?redirect_url=nextcloud/index.php/apps/specialapp'); $this->logger ->expects($this->once()) - ->method('logException'); + ->method('debug'); $response = $this->middleware->afterException( $this->controller, 'test', @@ -576,7 +576,7 @@ class SecurityMiddlewareTest extends \Test\TestCase { $this->middleware = $this->getMiddleware(false, false, false); $this->logger ->expects($this->once()) - ->method('logException'); + ->method('debug'); $response = $this->middleware->afterException( $this->controller, 'test', diff --git a/tests/lib/CapabilitiesManagerTest.php b/tests/lib/CapabilitiesManagerTest.php index 4909272c4a..ec07f3dfa3 100644 --- a/tests/lib/CapabilitiesManagerTest.php +++ b/tests/lib/CapabilitiesManagerTest.php @@ -149,7 +149,7 @@ class CapabilitiesManagerTest extends TestCase { }); $this->logger->expects($this->once()) - ->method('logException'); + ->method('error'); $res = $this->manager->getCapabilities(); diff --git a/tests/lib/Collaboration/Resources/ProviderManagerTest.php b/tests/lib/Collaboration/Resources/ProviderManagerTest.php index 19a34962a5..01e45de9fd 100644 --- a/tests/lib/Collaboration/Resources/ProviderManagerTest.php +++ b/tests/lib/Collaboration/Resources/ProviderManagerTest.php @@ -82,7 +82,7 @@ class ProviderManagerTest extends TestCase { ->willThrowException(new QueryException('A meaningful error message')); $this->logger->expects($this->once()) - ->method('logException'); + ->method('error'); $this->providerManager->registerResourceProvider('InvalidResourceProvider'); $resourceProviders = $this->providerManager->getResourceProviders(); @@ -101,7 +101,7 @@ class ProviderManagerTest extends TestCase { ->willReturn($this->createMock(ResourceProvider::class)); $this->logger->expects($this->once()) - ->method('logException'); + ->method('error'); $this->providerManager->registerResourceProvider('InvalidResourceProvider'); $this->providerManager->registerResourceProvider(ResourceProvider::class); From 50021e15a9e2c9d3e3d2fb670b3fa1c8acfcd4bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Thu, 3 Jun 2021 09:07:25 +0200 Subject: [PATCH 09/11] Enable memcached MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- .github/workflows/phpunit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index f924d9b9e6..70986f647d 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -8,7 +8,7 @@ on: - stable* env: - php-extensions: cli,ctype,curl,dom,fileinfo,gd,iconv,intl,json,ldap,mbstring,mysql,oci8,openssl,pdo_sqlite,pgsql,posix,redis,sqlite,xml,zip + php-extensions: cli,ctype,curl,dom,fileinfo,gd,iconv,intl,json,ldap,mbstring,memcached,mysql,oci8,openssl,pdo_sqlite,pgsql,posix,redis,sqlite,xml,zip jobs: phpunit-nodb: From e9a418262e53e6c4d38f16c2100c746ba0fb5f8b Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Thu, 3 Jun 2021 22:35:17 +0200 Subject: [PATCH 10/11] Add APCU extension Signed-off-by: Lukas Reschke --- .github/workflows/phpunit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 70986f647d..0603694a40 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -8,7 +8,7 @@ on: - stable* env: - php-extensions: cli,ctype,curl,dom,fileinfo,gd,iconv,intl,json,ldap,mbstring,memcached,mysql,oci8,openssl,pdo_sqlite,pgsql,posix,redis,sqlite,xml,zip + php-extensions: apcu,cli,ctype,curl,dom,fileinfo,gd,iconv,intl,json,ldap,mbstring,memcached,mysql,oci8,openssl,pdo_sqlite,pgsql,posix,redis,sqlite,xml,zip jobs: phpunit-nodb: From fb06c23f874548ed2f4ef083e648fdf029af0f62 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Thu, 3 Jun 2021 22:41:12 +0200 Subject: [PATCH 11/11] Add memcached image Signed-off-by: Lukas Reschke --- .github/workflows/phpunit.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 0603694a40..d73d098bbc 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -48,6 +48,10 @@ jobs: --health-retries 5 ports: - "6379:6379" + memcached: + image: memcached + ports: + - "11211:11211" phpunit-sqlite: runs-on: ubuntu-20.04