From f6c070a3cb36c5593123b27b4d1b6a5b7a10aba3 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sat, 3 Apr 2021 04:23:31 +0200 Subject: [PATCH] removed config warning cleaned up test.yml workflow try to run without .env files --- .github/workflows/test.yml | 19 ++++++++----------- backend/src/config/index.js | 5 ++--- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 276589dc0..5a8bb153c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -194,11 +194,10 @@ jobs: ########################################################################## # UNIT TESTS BACKEND ##################################################### ########################################################################## - # TODO: Why do we need those .envs? - - name: backend | copy env files webapp - run: cp webapp/.env.template webapp/.env - - name: backend | copy env files backend - run: cp backend/.env.template backend/.env + #- name: backend | copy env files webapp + # 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 neo4j backend - name: backend | Initialize Database @@ -232,13 +231,11 @@ jobs: ########################################################################## # UNIT TESTS WEBAPP ##################################################### ########################################################################## - # TODO: Why do we need those .envs? - - name: backend | copy env files webapp - run: cp webapp/.env.template webapp/.env - - name: backend | copy env files backend - run: cp backend/.env.template backend/.env + #- name: backend | copy env files webapp + # 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 - #run: docker run --rm ocelotsocialnetwork/webapp:build yarn run test run: docker-compose exec -T webapp yarn test \ No newline at end of file diff --git a/backend/src/config/index.js b/backend/src/config/index.js index b7d500b8b..3eb69153a 100644 --- a/backend/src/config/index.js +++ b/backend/src/config/index.js @@ -7,9 +7,8 @@ if (require.resolve) { try { dotenv.config({ path: require.resolve('../../.env') }) } catch (error) { - if (error.code === 'MODULE_NOT_FOUND') { - console.log('WARN: No `.env` file found in `/app` (docker) or `/backend` (no docker)') // eslint-disable-line no-console - } else { + // This error is thrown when the .env is not found + if (error.code !== 'MODULE_NOT_FOUND') { throw error } }