Skip to content

Commit 6c161ec

Browse files
committed
Only measure coverage on OS PHP
Alternative is to remove the pecl calls and use `apt install php*-pecl` as this is now provided. We discussed and measuring the coverage multiple times is not needed. As a contributor I think we also prefer to not measure the coverage already when testing with another PHP version but only in the CI.
1 parent 85b74e3 commit 6c161ec

File tree

2 files changed

+0
-8
lines changed

2 files changed

+0
-8
lines changed

docker-contributor/Dockerfile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,6 @@ WORKDIR /domjudge
8181
# Add PHP configuration
8282
COPY ["php-config", "//etc/php/7.4/fpm/conf.d"]
8383
COPY ["php-config", "//etc/php/7.4/cli/conf.d"]
84-
RUN for VERSION in $PHPSUPPORTED; do \
85-
for DIR in fpm cli; do \
86-
cp /etc/php/7.4/$DIR/conf.d/* /etc/php/$VERSION/$DIR/conf.d/; \
87-
done; \
88-
done
8984

9085
# Disable Xdebug by default
9186
RUN phpdismod xdebug

docker-gitlabci/Dockerfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,6 @@ RUN add-apt-repository ppa:ondrej/php -y && apt update && \
5656

5757
# Enable pcov (code coverage) in PHP
5858
COPY php-config/30-pcov.ini /etc/php/7.4/cli/conf.d/
59-
RUN for version in $PHPSUPPORTED; do \
60-
cp /etc/php/7.4/cli/conf.d/30-pcov.ini /etc/php/${version}/cli/conf.d/; \
61-
done
6259

6360
# Put the gitlab user in sudo
6461
RUN echo 'ALL ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers

0 commit comments

Comments
 (0)