Refresh main branches

.github/workflows/addGitHubOrganization.yaml

@@ -15,11 +15,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           token: ${{secrets.PAT}}
           repository: moderneinc/jenkins-ingest
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '17'

.github/workflows/ci.yml

@@ -21,10 +21,10 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: 17

add-github-organization.sh

@@ -10,9 +10,9 @@ gh repo list $1 --language groovy --archived --source --visibility public --limi
 gh repo list $1 --language kotlin --archived --source --visibility public --limit 1000 --json nameWithOwner,defaultBranchRef --template '{{range .}},{{.nameWithOwner}},{{.defaultBranchRef.name}},,,,,,TRUE,archived{{"\n"}}{{end}}' >> new.csv
 gh repo list $1 --language python --archived --source --visibility public --limit 1000 --json nameWithOwner,defaultBranchRef --template '{{range .}},{{.nameWithOwner}},{{.defaultBranchRef.name}},,,,,,TRUE,archived{{"\n"}}{{end}}' >> new.csv
 
+# Merge new repos into existing repos
+(cd parser/; ./gradlew build && java -cp build/libs/parser-1.0-SNAPSHOT.jar io.moderne.jenkins.ingest.Merger ../repos.csv  ../new.csv)
+rm new.csv
+
 # Quick analysis of largest organizations
 cut --delimiter='/' --fields=1 repos.csv | sort | uniq -c | sort -h | tail -n 20
-
-cd parser/
-./gradlew build && java -cp build/libs/parser-1.0-SNAPSHOT.jar io.moderne.jenkins.ingest.Merger ../repos.csv  ../new.csv
-rm ../new.csv

parser/src/main/java/io/moderne/jenkins/ingest/Merger.java

@@ -36,7 +36,7 @@ private static Map<Key, CsvRow> parseCsv(Path reposFile, int skip) throws IOExce
                     .map(line -> line.split(",", -1))
                     .peek(split -> {
                         if (split.length != 10) {
-                            throw new RuntimeException("Invalid CSV line: " + String.join(",", split));
+                            throw new RuntimeException("Invalid CSV line with " + split.length + " columns: " + String.join(",", split));
                         }
                     })
                     .map(split -> new CsvRow(split[0].equals("github.com") ? "" : split[0],