Skip to content

Commit

Permalink
Use same xdebug 3 version for php 7.2 and 8.0 as it works for both ac…
Browse files Browse the repository at this point in the history
…tually
  • Loading branch information
tigitz committed Aug 2, 2021
1 parent 54d94bb commit 4dc3968
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 5 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@ jobs:
run: |
export WITH_COVERAGE=$(if [[ ("${{ matrix.php }}" = "8.0") && ("${{ matrix.stability }}" = "--prefer-stable") ]]; then echo "true"; else echo "false"; fi)
echo "WITH_COVERAGE=${WITH_COVERAGE}" >> $GITHUB_ENV
export XDEBUG_VERSION=$(if [[ ("${{ matrix.php }}" = "7.2") then echo "2.9.3"; else echo "3.0.4"; fi)
echo "XDEBUG_VERSION=${XDEBUG_VERSION}" >> $GITHUB_ENV
make vendor
make tests
Expand Down
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
DOCKER_COMPOSE ?= docker-compose
EXEC_PHP = $(DOCKER_COMPOSE) run --rm -T php
PHP_VERSION ?= 8.0
XDEBUG_VERSION ?= 3.0.4
DEPS_STRATEGY ?= --prefer-stable
COMPOSER = $(EXEC_PHP) composer
WITH_COVERAGE ?= "FALSE"
Expand Down
1 change: 0 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ services:
context: docker/php
args:
PHP_VERSION: ${PHP_VERSION:-8.0}
XDEBUG_VERSION: ${XDEBUG_VERSION:-3.0.4}
volumes:
- .:/usr/src/myapp
- ./cache:/root/composer/cache
Expand Down
2 changes: 1 addition & 1 deletion docker/php/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ENV XDEBUG_MODE=coverage
RUN echo "memory_limit=-1" > "$PHP_INI_DIR/conf.d/memory-limit.ini" \
&& echo "date.timezone=${PHP_TIMEZONE:-UTC}" > "$PHP_INI_DIR/conf.d/date_timezone.ini"

ARG XDEBUG_VERSION
ARG XDEBUG_VERSION=3.0.4

RUN apt-get update \
&& apt install -y \
Expand Down

0 comments on commit 4dc3968

Please sign in to comment.