From f9f3737f73f19a70c7ee8744567d8bf7a50e6da8 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Sat, 9 Oct 2021 17:52:51 -0700 Subject: [PATCH] build: remove duplicate check for authors.yml update-authors.js will print if there are duplicates in the new entries so we can remove the (not working) duplication check in the authors.yml file. It would still be nice to get the information about duplicates into the body of the GitHub PR so no one has to manually check for duplicates (by either examining the file or looking at the Actions output), but that can be a future improvement. --- .github/workflows/authors.yml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/.github/workflows/authors.yml b/.github/workflows/authors.yml index e2195c9e73e96b..7374ff66a8c29d 100644 --- a/.github/workflows/authors.yml +++ b/.github/workflows/authors.yml @@ -15,23 +15,12 @@ jobs: with: fetch-depth: '0' # This is required to actually get all the authors - run: "tools/update-authors.js" # Run the AUTHORS tool - - name: "Check for duplicates" - run: | - PATTERN_FILE=`mktemp`; - git diff | egrep '^\+[^+]' | perl -pe 's/^\+(.+?) <.+\n/\1\n/g' > $PATTERN_FILE; - DUPLICATES=`grep -F -f $PATTERN_FILE AUTHORS | cut -d'<' -f1 | sort | uniq -c | sort -n | grep -v '^ *1 ' | perl -pe 's/^ *\d+ / /'`; # Last part here substitues a space at the start of each line - echo 'DUPLICATES<> $GITHUB_ENV - if [ ! -z "${DUPLICATES}" ]; then - echo "The following may be duplicates; consider adding a .mailmap entry for them:" >> $GITHUB_ENV; - echo "${DUPLICATES}" >> $GITHUB_ENV; - fi; - echo 'EOF' >> $GITHUB_ENV; # Each line of duplicates starts with a space, so it won't conflict with 'EOF' - uses: gr2m/create-or-update-pull-request-action@v1 # Create a PR or update the Action's existing PR env: GITHUB_TOKEN: ${{ secrets.GH_USER_TOKEN }} with: author: Node.js GitHub Bot - body: "Here are some new additions to the AUTHORS file. This is an automatically generated PR by the `authors.yml` GitHub Action, which runs `tools/update-authors.js`.\n\n{{ env.DUPLICATES }}" + body: "Here are some new additions to the AUTHORS file. This is an automatically generated PR by the `authors.yml` GitHub Action, which runs `tools/update-authors.js`." branch: "actions/authors-update" # Custom branch *just* for this Action. commit-message: "meta: update AUTHORS" labels: meta