From c1b58c065103f974840c885dc03fa4cd8d8e9c2a Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sat, 30 Jan 2021 07:31:17 +0100 Subject: [PATCH] - try to chain the docker-compose commands --- .github/workflows/ci.yml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f088265e7..74a00bd0d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -200,9 +200,11 @@ jobs: - name: backend | copy env files backend run: cp backend/.env.template backend/.env - name: backend | docker-compose - run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps neo4j backend - - name: backend | Unit test - run: docker-compose exec backend yarn test + run: | + docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps neo4j backend + docker-compose exec backend yarn test + #- name: backend | Unit test + # run: docker-compose exec backend yarn test ############################################################################## # JOB: UNIT TEST WEBAPP ###################################################### @@ -235,11 +237,13 @@ jobs: run: cp webapp/.env.template webapp/.env - name: backend | copy env files backend run: cp backend/.env.template backend/.env - - name: backend | docker-compose - run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps webapp - - name: webapp | Unit tests + - name: backend | docker-compose & unit-tests + run: | + docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps webapp + docker-compose exec webapp yarn test + #- name: webapp | Unit tests #run: docker run --rm ocelotsocialnetwork/webapp:build yarn run test - run: docker-compose exec webapp yarn test + # run: docker-compose exec webapp yarn test ############################################################################## # JOB: DOCKER BUILD PRODUCTION & PUSH ########################################