From 31bc53d2c9a1048fb3c8e8dcb324242d3cc1ae09 Mon Sep 17 00:00:00 2001 From: Brooke Date: Wed, 21 Dec 2022 09:15:07 -0800 Subject: [PATCH 1/5] PROD-3172 #comment This commit changes the user who does the git commits #time 15m --- .circleci/config.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 752e63d2..7231d168 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -58,8 +58,8 @@ running_version_patch: &running_version_patch name: Patching Version command: | npm install - git config user.name brooketopcoder - git config user.email brooke.souza@topcoder.com + git config user.name $CIRCLE_USERNAME + git config user.email security@topcoder.com npm version patch -m "Increment Version [ci skip]" git push --set-upstream origin master @@ -69,8 +69,8 @@ update_types: &update_types npm ci npm run types diffstatus=$(git status --porcelain) - git config user.name brooketopcoder - git config user.email brooke.souza@topcoder.com + git config user.name $CIRCLE_USERNAME + git config user.email security@topcoder.com git add types git diff-index --cached --quiet HEAD || git commit -m "Add Types [ci skip]" git push --set-upstream origin master @@ -164,6 +164,7 @@ workflows: branches: ignore: - master + - PROD-3172_circle-ci-user - build-prod: context : org-global @@ -171,6 +172,7 @@ workflows: branches: only: - master + - PROD-3172_circle-ci-user - deployDev: context : org-global From 9be4be7454b4ef2d55e4a674b2ec27a4969f74c0 Mon Sep 17 00:00:00 2001 From: Brooke Date: Wed, 21 Dec 2022 09:17:27 -0800 Subject: [PATCH 2/5] PROD-3172 Change branch to push to --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7231d168..59924be1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -61,7 +61,7 @@ running_version_patch: &running_version_patch git config user.name $CIRCLE_USERNAME git config user.email security@topcoder.com npm version patch -m "Increment Version [ci skip]" - git push --set-upstream origin master + git push --set-upstream origin PROD-3172_circle-ci-user update_types: &update_types name: Updating Types @@ -73,7 +73,7 @@ update_types: &update_types git config user.email security@topcoder.com git add types git diff-index --cached --quiet HEAD || git commit -m "Add Types [ci skip]" - git push --set-upstream origin master + git push --set-upstream origin PROD-3172_circle-ci-user finger_print_add: &finger_print_add fingerprints: From e551fb5599d7e3ef9555d30f352f8381d0742b7a Mon Sep 17 00:00:00 2001 From: brooketopcoder Date: Wed, 21 Dec 2022 17:18:24 +0000 Subject: [PATCH 3/5] Increment Version [ci skip] --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index d51fb270..02b2bec3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "universal-navigation", - "version": "1.0.5", + "version": "1.0.6", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "universal-navigation", - "version": "1.0.5", + "version": "1.0.6", "devDependencies": { "@sveltejs/vite-plugin-svelte": "^1.1.0", "@tsconfig/svelte": "^3.0.0", diff --git a/package.json b/package.json index 981af6b4..6d96acc9 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "universal-navigation", "private": true, - "version": "1.0.5", + "version": "1.0.6", "type": "module", "main": "./src/main.ts", "types": "./types/src/main.d.ts", From 968b707db47115c0f500b2f61eb9badf19016ac5 Mon Sep 17 00:00:00 2001 From: Brooke Date: Wed, 21 Dec 2022 09:24:00 -0800 Subject: [PATCH 4/5] PROD-3172 remove special handling for branch --- .circleci/config.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 59924be1..bc961d73 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -61,7 +61,7 @@ running_version_patch: &running_version_patch git config user.name $CIRCLE_USERNAME git config user.email security@topcoder.com npm version patch -m "Increment Version [ci skip]" - git push --set-upstream origin PROD-3172_circle-ci-user + git push --set-upstream origin master update_types: &update_types name: Updating Types @@ -73,7 +73,7 @@ update_types: &update_types git config user.email security@topcoder.com git add types git diff-index --cached --quiet HEAD || git commit -m "Add Types [ci skip]" - git push --set-upstream origin PROD-3172_circle-ci-user + git push --set-upstream origin master finger_print_add: &finger_print_add fingerprints: @@ -164,7 +164,6 @@ workflows: branches: ignore: - master - - PROD-3172_circle-ci-user - build-prod: context : org-global @@ -172,7 +171,6 @@ workflows: branches: only: - master - - PROD-3172_circle-ci-user - deployDev: context : org-global From 970fe1d9d8cc68b9bdc70dfc214e22cb74ad7575 Mon Sep 17 00:00:00 2001 From: Brooke Date: Wed, 21 Dec 2022 09:25:02 -0800 Subject: [PATCH 5/5] 1.0.5 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 02b2bec3..d51fb270 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "universal-navigation", - "version": "1.0.6", + "version": "1.0.5", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "universal-navigation", - "version": "1.0.6", + "version": "1.0.5", "devDependencies": { "@sveltejs/vite-plugin-svelte": "^1.1.0", "@tsconfig/svelte": "^3.0.0", diff --git a/package.json b/package.json index 6d96acc9..981af6b4 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "universal-navigation", "private": true, - "version": "1.0.6", + "version": "1.0.5", "type": "module", "main": "./src/main.ts", "types": "./types/src/main.d.ts",