diff options
| -rw-r--r-- | .cirrus.yml | 2 | ||||
| -rwxr-xr-x | contrib/cirrus/success.sh | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 461a39e4b..77d5ba702 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -55,7 +55,7 @@ env: #### Credentials and other secret-sauces, decrypted at runtime when authorized. #### # Freenode IRC credentials for posting status messages - IRCID: ENCRYPTED[e87bba62a8e924dc70bdb2b66b16f6ab4a60d2870e6e5534ae9e2b0076f483c71c84091c655ca239101e6816c5ec0883] + IRCID: ENCRYPTED[1913f8a4572b6a6d2036232327789c4f6c0d98cde53f0336d860cd219b4cbd83863eefd93471aef8fa1079d4698e382d] # Needed to build GCE images, within a GCE VM SERVICE_ACCOUNT: ENCRYPTED[99e9a0b1c23f8dd29e83dfdf164f064cfd17afd9b895ca3b5e4c41170bd4290a8366fe2ad8e7a210b9f751711d1d002a] # User ID for cirrus to ssh into VMs diff --git a/contrib/cirrus/success.sh b/contrib/cirrus/success.sh index 30d375d95..8a9618b91 100755 --- a/contrib/cirrus/success.sh +++ b/contrib/cirrus/success.sh @@ -18,18 +18,21 @@ then then SHARANGE="${CIRRUS_BASE_SHA}..${CIRRUS_CHANGE_IN_REPO}" EXCLUDE_RE='merge-robot' + EMAILCSET='[:alnum:]-+_@.' AUTHOR_NICKS=$(egrep -v '(^[[:space:]]*$)|(^[[:space:]]*#)' "$AUTHOR_NICKS_FILEPATH" | sort -u) # Depending on branch-state, it's possible SHARANGE could be _WAY_ too big MAX_NICKS=10 # newline separated GITLOG="git log --format='%ae'" - COMMIT_AUTHORS=$($GITLOGt $SHARANGE || $GITLOG -1 HEAD | \ + COMMIT_AUTHORS=$($GITLOG $SHARANGE || $GITLOG -1 HEAD | \ sort -u | \ egrep -v "$EXCLUDE_RE" | \ + tr --delete --complement "$EMAILCSET[:space:]" | \ tail -$MAX_NICKS) for c_email in $COMMIT_AUTHORS do + c_email=$(echo "$c_email" | tr --delete --complement "$EMAILCSET") echo -e "\tExamining $c_email" NICK=$(echo "$AUTHOR_NICKS" | grep -m 1 "$c_email" | \ awk --field-separator ',' '{print $2}' | tr -d '[[:blank:]]') |