From 5a36fe22fc0e517b9716c59c86cb911d44d083de Mon Sep 17 00:00:00 2001 From: Sarah Date: Thu, 22 Apr 2021 15:08:55 +0100 Subject: [PATCH] updating fingerprint --- .circleci/config.yml | 8 ++++---- .circleci/scripts/cherry-picker.sh | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 833382760..b4f98c96c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -665,7 +665,7 @@ jobs: - checkout - add_ssh_keys: # needs a key to push updated static asset commit back to github fingerprints: - - "3d:6b:98:55:78:4e:52:17:4e:17:ba:f3:bf:0b:96:2a" + - "fc:55:84:15:0a:1d:c8:e9:06:d0:e8:9c:7b:a9:b7:31" - attach_workspace: at: . - run: @@ -675,8 +675,8 @@ jobs: # if there are, we commit the ui static asset file # HEAD^! is shorthand for HEAD^..HEAD (parent of HEAD and HEAD) if ! git diff --quiet --exit-code HEAD^! ui/; then - git config --local user.email "hashicorp-ci@users.noreply.github.com" - git config --local user.name "hashicorp-ci" + git config --local user.email "github-team-consul-core@hashicorp.com" + git config --local user.name "hc-github-team-consul-core" short_sha=$(git rev-parse --short HEAD) git add agent/uiserver/bindata_assetfs.go @@ -886,7 +886,7 @@ jobs: - checkout - add_ssh_keys: # needs a key to push cherry-picked commits back to github fingerprints: - - "3d:6b:98:55:78:4e:52:17:4e:17:ba:f3:bf:0b:96:2a" + - "fc:55:84:15:0a:1d:c8:e9:06:d0:e8:9c:7b:a9:b7:31" - run: .circleci/scripts/cherry-picker.sh - run: *notify-slack-failure diff --git a/.circleci/scripts/cherry-picker.sh b/.circleci/scripts/cherry-picker.sh index 191bf1664..d0ef5a7f0 100755 --- a/.circleci/scripts/cherry-picker.sh +++ b/.circleci/scripts/cherry-picker.sh @@ -168,8 +168,8 @@ fi backport_failures=0 # loop through all labels on the PR for label in $labels; do - git config --local user.email "hashicorp-ci@users.noreply.github.com" - git config --local user.name "hashicorp-ci" + git config --local user.email "github-team-consul-core@hashicorp.com" + git config --local user.name "hc-github-team-consul-core" status "checking label: $label" # if the label matches docs-cherrypick, it will attempt to cherry-pick to stable-website if [[ $label =~ docs-cherrypick ]]; then