Skip to content

Commit

Permalink
fix CI environment variable; xdebug in env file
Browse files Browse the repository at this point in the history
  • Loading branch information
usu committed Apr 11, 2022
1 parent c861e6c commit 0650082
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
3 changes: 2 additions & 1 deletion .env.ci
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
USER_ID=1001
USER_ID=1001
XDEBUG_MODE=off
4 changes: 2 additions & 2 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ jobs:
name: "Tests: End-to-end"
runs-on: ubuntu-latest
env:
CI: 'true'
CI: 1
steps:

- uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846 # tag=v3
Expand Down Expand Up @@ -383,7 +383,7 @@ jobs:
name: "Tests: End-to-end for development setup"
runs-on: ubuntu-latest
env:
CI: 'false'
CI: 0
steps:

- uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846 # tag=v3
Expand Down
5 changes: 2 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,10 @@ services:
# See https://github.com/docker/for-linux/issues/264
# The `remote_host` below may optionally be replaced with `remote_connect_back`
# XDEBUG_MODE required for step debugging
XDEBUG_MODE: develop,debug,coverage
XDEBUG_MODE: ${XDEBUG_MODE}
# default port for Xdebug 3 is 9003
# idekey=VSCODE if you are debugging with VSCode
XDEBUG_CONFIG: >-
client_host=docker-host idekey=PHPSTORM
XDEBUG_CONFIG: ${XDEBUG_CONFIG}
# This should correspond to the server declared in PHPStorm `Preferences | Languages & Frameworks | PHP | Servers`
# Then PHPStorm will use the corresponding path mappings
PHP_IDE_CONFIG: serverName=localhost
Expand Down
2 changes: 1 addition & 1 deletion frontend/docker-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ fi

npm ci

if [ $CI -eq 'true' ]; then
if [ $CI -eq 1 ]; then
npm run build
npm run preview
else
Expand Down

0 comments on commit 0650082

Please sign in to comment.