Skip to content

Commit 0650082

Browse files
committed
fix CI environment variable; xdebug in env file
1 parent c861e6c commit 0650082

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

.env.ci

+2-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
USER_ID=1001
1+
USER_ID=1001
2+
XDEBUG_MODE=off

.github/workflows/continuous-integration.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ jobs:
319319
name: "Tests: End-to-end"
320320
runs-on: ubuntu-latest
321321
env:
322-
CI: 'true'
322+
CI: 1
323323
steps:
324324

325325
- uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846 # tag=v3
@@ -383,7 +383,7 @@ jobs:
383383
name: "Tests: End-to-end for development setup"
384384
runs-on: ubuntu-latest
385385
env:
386-
CI: 'false'
386+
CI: 0
387387
steps:
388388

389389
- uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846 # tag=v3

docker-compose.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,10 @@ services:
4949
# See https://github.com/docker/for-linux/issues/264
5050
# The `remote_host` below may optionally be replaced with `remote_connect_back`
5151
# XDEBUG_MODE required for step debugging
52-
XDEBUG_MODE: develop,debug,coverage
52+
XDEBUG_MODE: ${XDEBUG_MODE}
5353
# default port for Xdebug 3 is 9003
5454
# idekey=VSCODE if you are debugging with VSCode
55-
XDEBUG_CONFIG: >-
56-
client_host=docker-host idekey=PHPSTORM
55+
XDEBUG_CONFIG: ${XDEBUG_CONFIG}
5756
# This should correspond to the server declared in PHPStorm `Preferences | Languages & Frameworks | PHP | Servers`
5857
# Then PHPStorm will use the corresponding path mappings
5958
PHP_IDE_CONFIG: serverName=localhost

frontend/docker-setup.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ fi
1010

1111
npm ci
1212

13-
if [ $CI -eq 'true' ]; then
13+
if [ $CI -eq 1 ]; then
1414
npm run build
1515
npm run preview
1616
else

0 commit comments

Comments
 (0)