From a0aec7eeded944d867000e565ee318fde5d82d9a Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Thu, 10 Sep 2020 04:17:23 -0500 Subject: [PATCH] =?UTF-8?q?fix(directory):=20=F0=9F=90=9B=20only=20grep=20?= =?UTF-8?q?previous=20migrate=20commit=20by=20message?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit combining grep with author fails, but each filter individually works. not sure why --- services/directory/azure-pipelines.migrate.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/services/directory/azure-pipelines.migrate.yaml b/services/directory/azure-pipelines.migrate.yaml index 03bb62089..38d07979d 100644 --- a/services/directory/azure-pipelines.migrate.yaml +++ b/services/directory/azure-pipelines.migrate.yaml @@ -91,8 +91,6 @@ steps: - task: Bash@3 displayName: revert existing PR migration condition: and(eq(variables['abortJustMigrated.aborted'], 'false'), succeeded()) - env: - GITHUBNAME: $(GITHUBNAME) inputs: targetType: inline workingDirectory: services/directory/src @@ -101,7 +99,7 @@ steps: echo "$MIGLIST" if [[ $MIGLIST == *$SYSTEM_PULLREQUEST_PULLREQUESTNUMBER ]] ; then echo "A migration already exists for PR #$SYSTEM_PULLREQUEST_PULLREQUESTNUMBER. Reverting..." - REVERTHASH=$(git log -n 1 --author="$GITHUBNAME" --grep="feat(data): migrate PR #$SYSTEM_PULLREQUEST_PULLREQUESTNUMBER" --pretty=format:"%H") + REVERTHASH=$(git log -n 1 --grep="feat(data): migrate PR #$SYSTEM_PULLREQUEST_PULLREQUESTNUMBER" --pretty=format:"%H") git revert --no-edit "$REVERTHASH" fi