WIP

.github/workflows/update-new-members.yml

@@ -0,0 +1,26 @@
+name: Update new member files
+
+on:
+  push:
+    branches: [vladh/schema-continued]
+  workflow_dispatch:
+
+permissions:
+  contents: write
+  pages: write
+  id-token: write
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repo
+        uses: actions/checkout@v4
+      - name: Fetch main branch
+        run: git fetch origin main:main
+      - name: Install npm packages
+        run: npm install
+      - name: Update new member files
+        run: bash ./bin/update-new-members
+      - name: Commit member changes, if any
+        run: bash ./bin/commit-member-changes

bin/commit-member-changes

@@ -0,0 +1,14 @@
+#!/bin/bash -eu
+# Creates a commit with the changes in `src/content/members`, if any. Must be
+# run in the repo's root.
+
+if [[ $(git status --porcelain src/content/members) ]]; then
+  git config user.name 'Open Source Pledge GitHub Action Runner'
+  git config user.email '[email protected]'
+  git add src/content/members
+  git commit -m 'Add changes to src/content/members (automated commit)'
+  git push
+  echo "Changes to src/content/members committed"
+else
+  echo "No changes to local member data, skipping"
+fi

bin/update-all-members

@@ -0,0 +1,8 @@
+#!/bin/bash -eu
+# This script fetches the JSON files specified in `members.csv` for all
+# members. Must be run in the repo's root.
+
+while IFS= read -r line; do
+    line_parts=(${line//,/ })
+    ./bin/update-member ${line_parts[0]} ${line_parts[1]}
+done < members.csv

bin/update-member

@@ -0,0 +1,68 @@
+#!/usr/bin/env node
+
+import fs from 'fs';
+import fetch from 'node-fetch';
+
+
+const USAGE = `USAGE: ./bin/update-member foocorp https://foocorp.example.com/foocorp.json
+Must be run in the repo's root.`;
+
+
+async function updateMember(name, url) {
+  const localPath = `./src/content/members/${name}.json`;
+  console.log(`Fetching member: ${name}`);
+  console.log(`\t* Remote URL: ${url}`);
+  console.log(`\t* Local path: ${localPath}`);
+
+  let localMemberData = undefined;
+  if (fs.existsSync(localPath)) {
+    try {
+      localMemberData = JSON.parse(fs.readFileSync(localPath, 'utf8'));
+    } catch(e) {
+      console.log(`Saw invalid JSON in ${localPath}, ignoring local data`);
+    }
+  }
+
+  let remoteMemberData = undefined;
+  try {
+    remoteMemberData = await fetch(url)
+      .then((res) => res.text())
+      .then((text) => JSON.parse(text));
+  } catch (e) {
+    console.error(`ERROR: Failed to get JSON from ${url}`, e);
+    process.exit(1);
+  }
+
+  let shouldWrite = (localMemberData == undefined);
+
+  if (!shouldWrite) {
+    const localMtime = new Date(localMemberData.datetimeModified);
+    const remoteMtime = new Date(remoteMemberData.datetimeModified);
+    shouldWrite = remoteMtime > localMtime;
+  }
+
+  if (shouldWrite) {
+    console.log(`Remote JSON is newer, writing to ${localPath}`);
+    try {
+      fs.writeFileSync(localPath, JSON.stringify(remoteMemberData, null, 2));
+    } catch (e) {
+      console.error(`ERROR: Failed to write to ${localPath}`, e);
+      process.exit(1);
+    }
+  } else {
+    console.log("Remote JSON is older, skipping");
+  }
+}
+
+
+function main() {
+  const args = process.argv.slice(2);
+  if (args.length != 2) {
+    console.error(USAGE);
+    process.exit(1);
+  }
+  updateMember(args[0], args[1]);
+}
+
+
+main()

bin/update-new-members

@@ -0,0 +1,17 @@
+#!/bin/bash -eu
+# This script fetches the JSON files specified for all members that have been
+# added to `members.csv` compared to the `main` branch. Must be run in the
+# repo's root.
+
+new_member_lines=$(
+  diff \
+    --changed-group-format='%>' \
+    --unchanged-group-format='' \
+    <( git show main:members.csv ) \
+    members.csv
+) || true
+
+while IFS= read -r line; do
+  line_parts=(${line//,/ })
+  ./bin/update-member ${line_parts[0]} ${line_parts[1]}
+done <<< "$new_member_lines"

src/content/members/sentry.json → contrib/example-schema.json

@@ -1,6 +1,5 @@
 {
   "domain": "sentry.io",
-  "urlSource": "https://open.sentry.io/osspledge/data.json",
   "datetimeModified": "2024-07-19T12:24:46Z",
   "description": "Sentry has given to Open Source for soooooo many years.",
   "name": "Sentry",

members.csv

@@ -1 +1,2 @@
-sentry,https://open.sentry.io/funding/osspledge.json
+sentry,https://raw.githubusercontent.com/opensourcepledge/opensourcepledge.com/vladh/schema-continued/contrib/example-schema.json
+test,https://raw.githubusercontent.com/opensourcepledge/opensourcepledge.com/vladh/schema-continued/contrib/example-schema.json

package.json

@@ -15,6 +15,7 @@
     "@sentry/astro": "^8.18.0",
     "@tailwindcss/typography": "^0.5.13",
     "astro": "^4.11.5",
+    "node-fetch": "^3.3.2",
     "tailwindcss": "^3.4.6",
     "typescript": "^5.5.3"
   }

src/content/config.ts

@@ -38,7 +38,6 @@ export const collections = {
     schema: z
       .object({
         domain: z.string(),
-        urlSource: z.string().url(),
         datetimeModified: z.string().datetime(),
       })
       .merge(memberProvidedData),