Merge 503cf58 into b0ee1f2

nextcloud · Nov 29, 2020 · 0ccacd5 · 0ccacd5
2 parents b0ee1f2 + 503cf58
commit 0ccacd5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/.github/actions/run-tests/tests/Dockerfile b/.github/actions/run-tests/tests/Dockerfile
@@ -7,6 +7,9 @@ ARG PHPVERSION
 COPY install.sh /install.sh
 RUN /install.sh ${PHPVERSION}
 
+COPY xdebug.config /tmp/xdebug.config
+RUN cat /tmp/xdebug.config >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
+
 RUN mkdir /workdir
 WORKDIR /workdir
 

diff --git a/.github/actions/run-tests/tests/xdebug.config b/.github/actions/run-tests/tests/xdebug.config
@@ -0,0 +1,2 @@
+
+xdebug.mode=coverage
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -68,6 +68,8 @@
   [#343](https://github.com/nextcloud/cookbook/pull/343/) @christianlupus
 - Creating new recipe not possible due to null reference
   [#378](https://github.com/nextcloud/cookbook/pull/378/) @seyfeb
+- Reenabling CI testing with current xdebug 3
+  [#417](https://github.com/nextcloud/cookbook/pull/417/) @christianlupus
 
 ### Removed
 - Travis build system