From 1e5a9f1baa7b201f32f6e38ec891e6ffebebef1a Mon Sep 17 00:00:00 2001 From: eug-vs Date: Tue, 7 Apr 2020 16:13:47 +0300 Subject: fix: do not separately check in master & develop --- .circleci/config.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6d97946..68aed5f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -71,7 +71,11 @@ workflows: test: jobs: - - checkout_and_test + - checkout_and_test: + filters: + branches: + ignore: develop + ignore: master deploy: jobs: -- cgit v1.2.3 From b4845e397b8c655b5cf4835ae23482eb62da2a1f Mon Sep 17 00:00:00 2001 From: eug-vs Date: Tue, 7 Apr 2020 16:14:46 +0300 Subject: fix: build pages before deploying --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 847abef..f5e6d22 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "lint": "eslint . --ext ts,tsx --max-warnings 0", "test": "npm run lint && tsc", "build-pages": "react-scripts build", - "deploy-pages": "gh-pages -d build", + "deploy-pages": "npm run build-pages && gh-pages -d build", "compile-dist": "rm -rf dist && tsc --project tsconfig.release.json", "publish-package": "npm run lint && npm run build && npm publish --public" }, -- cgit v1.2.3 From a927a543b849d39da80cce2e28d61098ca531c16 Mon Sep 17 00:00:00 2001 From: eug-vs Date: Tue, 7 Apr 2020 16:17:16 +0300 Subject: fix: ignore branches correctly --- .circleci/config.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 68aed5f..f3500d2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -74,8 +74,7 @@ workflows: - checkout_and_test: filters: branches: - ignore: develop - ignore: master + ignore: /^(master|develop)$/ deploy: jobs: -- cgit v1.2.3