Skip to content

Commit 1cb96d9

Browse files
author
vikasrohit
authored
Merge pull request #2978 from appirio-tech/dev
Connect 2.4.11
2 parents caa97cf + 308ad46 commit 1cb96d9

File tree

108 files changed

+10236
-7025
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+10236
-7025
lines changed

.circleci/config.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ install_deploysuite: &install_deploysuite
1818
cp ./../buildscript/buildenv.sh .
1919
cp ./../buildscript/awsconfiguration.sh .
2020
restore_cache_settings_for_build: &restore_cache_settings_for_build
21-
key: test-node-modules-{{ .Environment.CACHE_VERSION }}-{{ checksum "package-lock.json" }}
21+
key: connect-node-modules-{{ checksum "package-lock.json" }}
2222
save_cache_settings: &save_cache_settings
23-
key: test-node-modules-{{ .Environment.CACHE_VERSION }}-{{ checksum "package-lock.json" }}
23+
key: connect-node-modules-{{ checksum "package-lock.json" }}
2424
paths:
2525
- node_modules
2626
running_npm_build: &running_npm_build
@@ -90,6 +90,7 @@ jobs:
9090
./buildenv.sh -e DEV -b dev-connectapp-deployvar
9191
source buildenvvar
9292
./master_deploy.sh -d CFRONT -e DEV -c false
93+
9394
deployProd:
9495
<<: *deploy_defaults
9596
steps:
@@ -104,13 +105,16 @@ jobs:
104105
./buildenv.sh -e PROD -b prod-connectapp-deployvar
105106
source buildenvvar
106107
./master_deploy.sh -d CFRONT -e PROD -c true
108+
107109
workflows:
108110
version: 2
109111
build:
110112
jobs:
111113
- build-dev:
112114
context : org-global
113-
115+
filters:
116+
branches:
117+
ignore: ['master']
114118
- build-prod:
115119
context : org-global
116120
filters:

0 commit comments

Comments
 (0)