From 7ebc8db9ef2defc633bd4c6b93f5ca5dcbdad408 Mon Sep 17 00:00:00 2001 From: verzelea Date: Tue, 3 Nov 2020 13:58:01 +0100 Subject: [PATCH] Fix: syntaxe v3 --- .circleci/config.yml | 87 +++++++++++++++++++++++--------------------- 1 file changed, 46 insertions(+), 41 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index af75b4f..b55f5e0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,57 +6,62 @@ workflows: - lint: requires: - build + - test: + requires: + - build - e2e: requires: - build jobs: build: docker: - - image: cimg/node:14.10.1 + - image: cimg/node:12.18 steps: - checkout - restore_cache: - key: yarn-packages-v2{{ checksum "yarn.lock" }} + key: yarn-packages-v2{{ checksum "yarn.lock" }} - run: yarn global add node-gyp && yarn install - save_cache: - key: yarn-packages-v2{{ checksum "yarn.lock" }} - paths: - - ./node_modules + key: yarn-packages-v2{{ checksum "yarn.lock" }} + paths: + - ./node_modules + test: + docker: + - image: cimg/node:12.18 + steps: + - checkout + - restore_cache: + key: yarn-packages-v2{{ checksum "yarn.lock" }} + - run : yarn test:ci lint: - docker: - - image: cimg/node:14.10.1 - steps: - - checkout - - restore_cache: - key: yarn-packages-v2{{ checksum "yarn.lock" }} - - run: yarn lint && yarn format:check - - run: yarn test:ci - - save_cache: - key: yarn-packages-v2{{ checksum "yarn.lock" }} - paths: - - ./node_modules + docker: + - image: cimg/node:12.18 + steps: + - checkout + - restore_cache: + key: yarn-packages-v2{{ checksum "yarn.lock" }} + - run: yarn lint && yarn format:check e2e: - docker: - - image: cimg/node:12.18 - environment: - DATABASE_URL: "postgres://e2e:test@localhost:5432/psdb" - API_PORT: 3000 - API_HOST: localhost - API_PROTOCOL: http - JWT_SECRET: wazaa - - image: circleci/postgres:9.6.2-alpine - environment: - POSTGRES_USER: e2e - POSTGRES_DB: psdb - POSTGRES_PASSWORD: test - - steps: - - checkout - - restore_cache: - key: yarn-packages-v2{{ checksum "yarn.lock" }} - - run: - name: Waiting for POSTGRES - command: dockerize -wait tcp://localhost:5432 -timeout 1m - - run: - name: Launching e2e test - command: yarn test:e2e \ No newline at end of file + docker: + - image: cimg/node:12.18 + environment: + DATABASE_URL: "postgres://e2e:test@localhost:5432/psdb" + API_PORT: 3000 + API_HOST: localhost + API_PROTOCOL: http + JWT_SECRET: wazaa + - image: circleci/postgres:9.6.2-alpine + environment: + POSTGRES_USER: e2e + POSTGRES_DB: psdb + POSTGRES_PASSWORD: test + steps: + - checkout + - restore_cache: + key: yarn-packages-v2{{ checksum "yarn.lock" }} + - run: + name: Waiting for POSTGRES + command: dockerize -wait tcp://localhost:5432 -timeout 1m + - run: + name: Launching e2e test + command: yarn test:e2e \ No newline at end of file