Consider already existing names in acknowledgements generation

This avoids repeated resolution of name-inconsistencies and preserves
already applied name corrections.

Author: HannesWell

.github/workflows/checkAcknowledgements.yml

@@ -0,0 +1,53 @@
+name: Check acknowledgements consistency
+on:
+  pull_request:
+    paths:
+      - news/*/acknowledgements.md
+
+permissions:
+  contents: read
+
+jobs:
+  validate:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      with:
+        fetch-depth: 0
+    - name: Determine changed files
+      id: changed-files
+      run: |
+        changedFiles=$(git diff --name-only --diff-filter=ACMR ${{ github.event.pull_request.base.sha }} ${{ github.event.pull_request.head.sha }} | grep acknowledgements.md$ | xargs)
+        echo "Changed files: ${changedFiles}"
+        echo "files=${changedFiles}" >> "$GITHUB_OUTPUT"
+    - name: Check modified acknowledgements files
+      uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+      id: collect-contributors
+      with:
+        script: |
+          const fs = require('fs')
+          const files = '${{ steps.changed-files.outputs.files }}'.trim().split(/\s+/)
+          const nameIdRegex = /\[(?<name>[^\]]+)\]\(https:\/\/github\.com\/(?<id>[^\)/]+)\)/g
+          for (file of files) {
+            let lines = fs.readFileSync(file, {encoding: 'utf8'}).split(/\r?\n/)
+            const contributorNames = new Map()
+            for (line of lines) {
+              for (match of line.matchAll(nameIdRegex)) {
+                computeIfAbsent(contributorNames, match.groups.id, () => new Set()).add(match.groups.name)
+              }
+            }
+            for (const [profile, names] of contributorNames) {
+              if (names.size > 1) {
+                core.setFailed("Multiple names found for profile '" + profile + "': " + Array.from(names).join(', '))
+              }
+            }
+          }
+          
+          function computeIfAbsent(map, key, valueSupplier) {
+            let value = map.get(key)
+            if (!value) {
+              value = valueSupplier()
+              map.set(key, value)
+            }
+            return value
+          }

.github/workflows/generateAcknowledgements.yml

@@ -127,7 +127,7 @@ jobs:
                     profile = committerProfile
                   }
                   contributors.add(profile)
-                  computeIfAbsent(contributorNames, profile, () => new Set()).add(authorName)
+                  computeIfAbsent(contributorNames, profile, () => new Set()).add(authorName.trim())
                 } else { // author is null for directly pushed commits, which happens e.g. for I-build submodule updates
                   console.log("Skip commit of " + authorName)
                 }
@@ -137,15 +137,34 @@ jobs:
             console.log('Processed commits: ' + commitCount)
           }
           
+          // ------------------------------------------------------
+          // Read existing names
+          // ------------------------------------------------------
+          const fs = require('fs')
+          const acknowledgementsFile = 'website/news/${{ inputs.eclipse-version }}/acknowledgements.md'
+          let lines = fs.readFileSync(acknowledgementsFile, {encoding: 'utf8'}).split(/\r?\n/)
+          
+          const nameIdRegex = /\[(?<name>[^\]]+)\]\(https:\/\/github\.com\/(?<id>[^\)/]+)\)/g
+          const existingContributorNames = new Map()
+          for (line of lines) {
+            for (match of line.matchAll(nameIdRegex)) {
+              existingContributorNames.set(match.groups.id.trim(), match.groups.name.trim())
+            }
+          }
           // ------------------------------------------------------
           // Select name if multiple have been found for one contributor
           // ------------------------------------------------------
           const selectedContributorNames = new Map()
           const nameInconsistencies = []
           for (const [profile, names] of contributorNames) {
             // Select longest name, assuming that's correct
-            let selectedName = [...names].reduce((n1, n2) => n1.length > n2.length ? n1 : n2)
-            if (names.size > 1) {
+            let selectedName = [...names][0]
+            const existingName = existingContributorNames.get(profile)
+            if (existingName && (selectedName != existingName || names.size > 1)) {
+              selectedName = existingName
+              console.log("Reuse existing name '" + existingName + "' for " + profile + ", instead of encountered: " + Array.from(names).join(', '))
+            } else if (names.size > 1) {
+              selectedName = [...names].reduce((n1, n2) => n1.length > n2.length ? n1 : n2)
               console.log("Multiple names encountered for " + profile + ": " + Array.from(names).join(', '))
               nameInconsistencies.push("@" + profile + ": " + Array.from(names).map(n => n==selectedName ? ("**`" + n + "`**") : ("`" + n + "`")).join(', '))
             }
@@ -155,9 +174,6 @@ jobs:
           // ------------------------------------------------------
           // Insert the list of contributors into the template file
           // ------------------------------------------------------
-          const fs = require('fs')
-          const acknowledgementsFile = 'website/news/${{ inputs.eclipse-version }}/acknowledgements.md'
-          let lines = fs.readFileSync(acknowledgementsFile, {encoding: 'utf8'}).split(/\r?\n/)
           let elementsInLine = 0
           for (const [organization, contributors] of orgaContributors) {
             console.log('Insert contributors of ' + organization)