.github/workflows/build.yml

@@ -21,21 +21,6 @@ jobs:
       - name: Run Biome
         run: biome ci .
 
-  check-yarn-lock:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Set up Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 'lts/*'
-          cache: 'yarn'
-
-      - name: Check yarn.lock
-        run: yarn install --frozen-lockfile
-
   build-test-deploy:
     name: Build, Test and Deploy
     environment: build
@@ -50,7 +35,6 @@ jobs:
         with:
           images: |
             europe-west4-docker.pkg.dev/ghost-activitypub/main/activitypub
-            europe-docker.pkg.dev/ghost-activitypub/activitypub/activitypub
           tags: |
             type=edge,branch=main
             type=semver,pattern={{version}}
@@ -64,7 +48,6 @@ jobs:
         with:
           images: |
             europe-west4-docker.pkg.dev/ghost-activitypub/main/migrations
-            europe-docker.pkg.dev/ghost-activitypub/activitypub/migrations
           tags: |
             type=edge,branch=main
             type=semver,pattern={{version}}
@@ -89,28 +72,24 @@ jobs:
       - name: "Run Tests"
         run: yarn test
 
-      - name: "Login to GAR europe-west4"
+      - name: "Login to GAR"
+        if: github.ref == 'refs/heads/main'
         uses: docker/login-action@v3
         with:
           registry: europe-west4-docker.pkg.dev
           username: _json_key
           password: ${{ secrets.SERVICE_ACCOUNT_KEY }}
 
-      - name: "Login to GAR europe"
-        uses: docker/login-action@v3
-        with:
-          registry: europe-docker.pkg.dev
-          username: _json_key
-          password: ${{ secrets.SERVICE_ACCOUNT_KEY }}
-
       - name: "Push ActivityPub Docker Image"
+        if: github.ref == 'refs/heads/main'
         uses: docker/build-push-action@v6
         with:
           context: .
           push: true
           tags: ${{ steps.activitypub-docker-metadata.outputs.tags }}
 
       - name: "Push Migrations Docker Image"
+        if: github.ref == 'refs/heads/main'
         uses: docker/build-push-action@v6
         with:
           context: migrate
@@ -132,15 +111,7 @@ jobs:
           job: migrations
           flags: '--wait --execute-now --set-cloudsql-instances=ghost-activitypub:europe-west4:activitypub-db'
 
-      - name: "Deploy ActivityPub Queue to Cloud Run"
-        if: github.ref == 'refs/heads/main'
-        uses: 'google-github-actions/deploy-cloudrun@v2'
-        with:
-          image: europe-west4-docker.pkg.dev/ghost-activitypub/main/activitypub:${{ steps.activitypub-docker-metadata.outputs.version }}
-          region: europe-west4
-          service: activitypub-sub
-
-      - name: "Deploy ActivityPub API to Cloud Run"
+      - name: "Deploy ActivityPub to Cloud Run"
         if: github.ref == 'refs/heads/main'
         uses: 'google-github-actions/deploy-cloudrun@v2'
         with:

README.md

@@ -86,6 +86,12 @@ If you would like to run other commands you can run `docker compose exec -it mig
 
  
 
+# Community leaderboard
+
+![Leaderboard](https://github.com/TryGhost/ActivityPub/assets/115641230/371e8f36-8293-43d2-912a-772e56517e1d)
+
+ 
+
 # Copyright & license
 
 Copyright (c) 2013-2025 Ghost Foundation - Released under the [MIT license](LICENSE). Ghost and the Ghost Logo are trademarks of Ghost Foundation Ltd. Please see our [trademark policy](https://ghost.org/trademark/) for info on acceptable usage.

cedar/README.md

@@ -1,30 +1,23 @@
 # 🌳 Cedar
 
-Cedar is a collection of tools for generating fake data and seeding a
-database with it for use in testing and development.
+Cedar is a collection of tools for generating fake data and seeding a database
+with it for use in testing and development. 
 
 The code is split into the following directories:
 
-- `schema`: SQL schema for the database.
-- `data-generation`: Generating fake data and seeding the database
-  with it.
-- `query-runner`: Running queries against the database.
+  - `schema`: SQL schema for the database.
+  - `data-generation`: Generating fake data and seeding the database with it.
+  - `query-runner`: Running queries against the database.
 
 ## Data Generation
 
-These commands are all run in the `data-generation` directory.
+These commands are all run in the data-generation directory
 
-Generate fake data by creating a series of CSV files that can be
-imported into a database.
+Generate fake data by creating a series of CSV files that can be imported into a
+database.
 
-Adjust the `config.js` file to set the parameters used to control the
-size of the data set that will be generated.
-
-### Install dependencies
-
-```bash
-npm install
-```
+Adjust the `config.js` file to set the parameters used to control the size of
+the data set that will be generated.
 
 ### Generate base data
 
@@ -58,133 +51,43 @@ npm install
 
 ### Prepare data to be exported elsewhere
 
-This compresses the generated data files to make them easier to
-transfer.
-
-**Prerequisite**: Install `pigz` on your host machine (`brew install
-pigz` on macOS)
+This gzips the generated data files so they are easier to transfer
 
 ```bash
 ./data-export.sh
 ```
 
-## Importing Data to GCP
-
-This section guides you through setting up a Google Cloud Platform
-database and importing the generated data into it.
-
-### Prerequisites
-
-- `gcloud` CLI configured with appropriate permissions
-- Generated data files (from the steps above)
-
-### Step 1: Set up gcloud environment
-
-If you don't have `gcloud` set up on your host machine, use the
-provided Docker container:
-
-```bash
-./gcloud.sh
-```
-
-This runs:
-
-```bash
-docker run -it --rm \
-  -v $HOME/.config/gcloud:/root/.config/gcloud \
-  -v $(pwd):/workspace \
-  -w /workspace \
-  google/cloud-sdk
-```
-
-You'll need to run `gcloud auth login` to setup your credentials the
-first time.
-
-### Step 2: Set up your GCP resources
-
-Run the setup script to create a database, a storage bucket, upload the schema, 
-and apply it to the database:
-
-```bash
-./setup.sh
-```
-
-Run this from within the gcloud Docker container if you're using the `gcloud.sh`
-script noted above.
-
-The parameters used for setting up the resources can be configured in
-the `args.sh` file.
-
-### Step 3: Generate data
-
-Follow the instructions in the [Data Generation](#data-generation)
-section above to create your data files.
-
-### Step 4: Upload data to GCP
-
-Upload the compressed data files to your GCP storage bucket and import them
-into the database:
-
-```bash
-./upload-data.sh
-```
-
-Run this from within the gcloud Docker container if you're using the `gcloud.sh`
-script noted above.
-
-### Step 5: Run queries
-
-After importing, you can use the query runner as described in the next
-section.
-
 ## Query Runner
 
-These commands are all run in the `query-runner` directory.
+These commands are all run in the query-runner directory
 
 ### Build Docker image
 
-```bash
-docker build . \
-  -t gcr.io/ghost-activitypub/activitypub-data-generator:latest
+```
+docker build . -t gcr.io/ghost-activitypub/activitypub-data-generator:latest .
 ```
 
 ### Push Docker image to GCP
 
-```bash
+```
 docker push gcr.io/ghost-activitypub/activitypub-data-generator:latest
 ```
 
 ### Run Query Runner as Cloud Run Job
 
-You can do this via the UI in the GCP Console.
+You can do this via the UI in the GCP Console
 
 ### Local Testing
 
-You can run this locally with the following commands, but a more
-accurate test is to run this as a Cloud Run Job in GCP.
-
-**Note:** For local testing, you may need to remove the platform
-specification (`--platform=linux/amd64`) from the first line of the
-Dockerfile.
-
-**Prerequisite:** Ensure you have a local MySQL instance running that you
-can connect to using the `MYSQL_HOST`, `MYSQL_USER`, `MYSQL_PASSWORD`,
-and `MYSQL_DATABASE` environment variables defined in commands below. The database
-will need to have the schema stored in `schema` applied to it. The database will
-need to have the data files generated previously imported into it.
+You can run this locally with the following commands, but a more accurate test
+is to run this as a CloudRun Job in GCP. You will need to remove the platform
+from the first line of the Dockerfile `--platform=linux/amd64`
 
-Install dependencies:
-```bash
-yarn install
 ```
-
-Build the local image:
-```bash
 docker build . -t query-runner:latest
 ```
 
-Run with database connection details:
-```bash
+```
 docker run --rm \ 
   -e MYSQL_HOST=<ip> \
   -e MYSQL_USER=<user> \
@@ -193,12 +96,13 @@ docker run --rm \
   query-runner
 ```
 
-Combined build and run command:
-```bash
+```
 docker build . -t query-runner:latest && docker run --rm \
   -e MYSQL_HOST=<ip> \
   -e MYSQL_USER=<user> \
   -e MYSQL_PASSWORD=<pass> \
   -e MYSQL_DATABASE=activitypub_061224 \
   query-runner
 ```
+
+

cedar/data-generation/config.js

@@ -1,6 +1,7 @@
 const SCALING_FACTOR = 1;
 
 const DATA_DIR = process.env.DATA_DIR || './data';
+console.log(`Using data dir: ${DATA_DIR}`);
 
 const NUM_SITES = Math.round(60_000 * SCALING_FACTOR);
 const NUM_USERS = Math.round(300_000 * SCALING_FACTOR);

cedar/data-generation/data-generate.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-export DATA_DIR=./data
+export DATA_DIR=./data/generated_$(date +%Y-%m-%d_%H-%M-%S)
 
 mkdir -p $DATA_DIR