Skip to content

Commit

Permalink
NOT Fix CI workflow
Browse files Browse the repository at this point in the history
5 commits and still it doesn't work! This is the worst system ever!!
  • Loading branch information
sstok committed Apr 11, 2020
1 parent e62c09f commit d7f9b9b
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 12 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ on:
branches:
- master
env:
ES_HTTP_PORT: 59200
ES_HTTP_PORT: '59200'
ELASTICSEARCH_HOST: 'localhost'
ELASTICSEARCH_PORT: '59200'
QA_DOCKER_IMAGE: "rollerworks/search-phpqa:latest"

jobs:
Expand All @@ -25,6 +27,7 @@ jobs:
image: postgres:9.6
env:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
POSTGRES_DB: search_tests
ports:
- "55432:5432"
Expand Down Expand Up @@ -75,7 +78,7 @@ jobs:
# —— Composer 🧙‍️ —————————————————————————————————————————————————————————
-
name: Install Composer dependencies
run: make make in-docker-install
run: make in-docker-install

## —— Tests ✅ ———————————————————————————————————————————————————————————
-
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@ docker-down:
##
in-docker-install:
rm -f composer.lock
composer.phar install --no-progress --no-interaction --no-suggest --optimize-autoloader --ansi
composer install --no-progress --no-interaction --no-suggest --optimize-autoloader --ansi

in-docker-install-dev:
rm -f composer.lock
cp composer.json _composer.json
composer.phar config minimum-stability dev
composer.phar update --no-progress --no-interaction --no-suggest --optimize-autoloader --ansi
composer config minimum-stability dev
composer update --no-progress --no-interaction --no-suggest --optimize-autoloader --ansi
mv _composer.json composer.json

in-docker-install-lowest:
Expand Down
3 changes: 2 additions & 1 deletion docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@ services:

# Storage services
pgsql:
image: postgres:9.6-alpine
image: postgres:9.6
environment:
- POSTGRES_DB=search_tests
- POSTGRES_USER=postgres
- POSTGRES_PASSWORD=postgres
volumes:
- pg-data:/var/lib/postgresql/data:rw
ports:
Expand Down
4 changes: 2 additions & 2 deletions travis/mysql.travis.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
<ini name="memory_limit" value="-1"/>

<var name="db_type" value="pdo_mysql"/>
<var name="db_host" value="mariadb-server"/>
<var name="db_host" value="localhost"/>
<var name="db_username" value="root"/>
<var name="db_password" value="nope"/>
<var name="db_name" value="search_tests"/>
<var name="db_port" value="3306"/>

<!-- These parameters are not really used, but they are need for the Doctrine TestUtil -->
<var name="tmpdb_type" value="mysqli"/>
<var name="tmpdb_host" value="mariadb-server"/>
<var name="tmpdb_host" value="localhost"/>
<var name="tmpdb_username" value="root"/>
<var name="tmpdb_password" value="nope"/>
<var name="tmpdb_port" value="3306"/>
Expand Down
8 changes: 4 additions & 4 deletions travis/pgsql.travis.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@
<ini name="memory_limit" value="-1"/>

<var name="db_type" value="pdo_pgsql"/>
<var name="db_host" value="pgsql" />
<var name="db_host" value="localhost" />
<var name="db_username" value="postgres" />
<var name="db_password" value="" />
<var name="db_password" value="postgres" />
<var name="db_name" value="search_tests" />
<var name="db_port" value="5432"/>

<!-- These parameters are not really used, but they are need for the Doctrine TestUtil -->
<var name="tmpdb_type" value="pdo_pgsql"/>
<var name="tmpdb_host" value="pgsql" />
<var name="tmpdb_host" value="localhost" />
<var name="tmpdb_username" value="postgres" />
<var name="tmpdb_password" value="" />
<var name="tmpdb_password" value="postgres" />
<var name="tmpdb_port" value="5432"/>
</php>

Expand Down

0 comments on commit d7f9b9b

Please sign in to comment.