From 92fab50f3a15d3569f192e684b9d9fcc051c50c0 Mon Sep 17 00:00:00 2001 From: Salim Afiune Maya Date: Thu, 29 Jul 2021 14:27:52 -0500 Subject: [PATCH] ci: sign lacework-releng commits Signed-off-by: Salim Afiune Maya --- scripts/release.sh | 2 +- scripts/release_helpers.sh | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/scripts/release.sh b/scripts/release.sh index a26c70a..417487c 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -15,7 +15,7 @@ source scripts/release_helpers.sh readonly org_name=lacework readonly project_name=terraform-aws-ecs-agent readonly git_user="Lacework Inc." -readonly git_email="ops+releng@lacework.net" +readonly git_email="tech-ally@lacework.net" readonly required_files_for_release=( RELEASE_NOTES.md CHANGELOG.md diff --git a/scripts/release_helpers.sh b/scripts/release_helpers.sh index 3da9f6d..d9a8235 100644 --- a/scripts/release_helpers.sh +++ b/scripts/release_helpers.sh @@ -71,10 +71,13 @@ bump_version() { fi log "commiting and pushing the version bump to github" - git config --global user.email $git_email - git config --global user.name $git_user + if [ "$CI" != "" ]; then + git config --global user.email $git_email + git config --global user.name $git_user + git config --global user.signingkey $GPG_SIGNING_KEY + fi git_add_version_files - git commit -m "chore: version bump to v$VERSION" + git commit -sS -m "ci: version bump to v$VERSION" git push origin $main_branch } @@ -146,9 +149,10 @@ push_release() { if [ "$CI" != "" ]; then git config --global user.email $git_email git config --global user.name $git_user + git config --global user.signingkey $GPG_SIGNING_KEY fi git checkout -B release - git commit -am "release: v$_version_no_tag" + git commit -sS -am "release: v$_version_no_tag" git push origin release -f }