Merge branch 'main' into golang-ci-enable-all

.github/workflows/ci.yml

@@ -4,9 +4,7 @@ on:
   push:
     branches: [main, release/*]
   pull_request:
-    branches:
-      - "main"
-      - "release/*"
+    branches: [main, release/*]
 
 jobs:
   build:

.github/workflows/flow.yml

@@ -2,8 +2,7 @@ name: Flow build and test
 
 on:
   pull_request:
-    branches:
-      - "main"
+    branches: [main]
   push:
     branches: [main]
 
@@ -96,7 +95,7 @@ jobs:
 
       - name: run tests
         run: |
-          gotestsum --format testname -- -p 8 ./... -timeout 2400s
+          gotestsum --format testname -- -p 8 ./... -timeout 1200s
         working-directory: ./flow
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}

.github/workflows/golang-lint.yml

@@ -2,8 +2,8 @@ name: GolangCI-Lint
 
 on:
   pull_request:
-    branches:
-      - "main"
+    branches: [main]
+    paths: [flow/**]
 
 jobs:
   golangci-lint:

.github/workflows/rust-lint.yml

@@ -2,8 +2,8 @@ name: clippy-action
 
 on:
   pull_request:
-    branches:
-      - "main"
+    branches: [main]
+    paths: [nexus/**]
 
 jobs:
   clippy:

.github/workflows/ui-build.yml

@@ -2,11 +2,10 @@ name: Build & Test UI
 
 on:
   push:
-    branches:
-      - main
+    branches: [main]
   pull_request:
-    branches:
-      - main
+    branches: [main]
+    paths: [ui/**]
 
 jobs:
   build-test:

.github/workflows/ui-lint.yml

@@ -2,11 +2,10 @@ name: Lint UI
 
 on:
   push:
-    branches:
-      - main
+    branches: [main]
   pull_request:
-    branches:
-      - main
+    branches: [main]
+    paths: [ui/**]
 
 permissions:
   checks: write

dev-peerdb.sh

@@ -1,12 +1,27 @@
-#!/bin/bash
-set -Eeuo pipefail
+#!/bin/sh
+if test -z "$USE_PODMAN"
+then
+    if ! command -v docker &> /dev/null
+    then
+        if command -v podman-compose
+        then
+            echo "docker could not be found on PATH, using podman-compose"
+            USE_PODMAN=1
+        else
+            echo "docker could not be found on PATH"
+            exit 1
+        fi
+    fi
+fi
 
-if ! command -v docker &> /dev/null
+if test -z "$USE_PODMAN"
 then
-    echo "docker could not be found on PATH"
-    exit 1
+    DOCKER="docker compose"
+    EXTRA_ARGS="--no-attach temporal --no-attach pyroscope --no-attach temporal-ui"
+else
+    DOCKER="podman-compose --podman-run-args=--replace"
+    EXTRA_ARGS=""
 fi
 
 export PEERDB_VERSION_SHA_SHORT=local-$(git rev-parse --short HEAD)
-docker compose -f docker-compose-dev.yml up --build \
- --no-attach temporal --no-attach pyroscope --no-attach temporal-ui
+exec $DOCKER -f docker-compose-dev.yml up --build $EXTRA_ARGS

docker-compose-dev.yml

@@ -44,7 +44,7 @@ services:
     volumes:
       - pgdata:/var/lib/postgresql/data
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready", "-d", "postgres", "-U", "postgres"]
+      test: ["CMD", "pg_isready", "-d", "postgres", "-U", "postgres"]
       interval: 10s
       timeout: 30s
       retries: 5
@@ -133,7 +133,7 @@ services:
       dockerfile: stacks/flow.Dockerfile
       target: flow-snapshot-worker
     environment:
-      <<: [*flow-worker-env]
+      <<: [*catalog-config, *flow-worker-env]
     depends_on:
       temporal-admin-tools:
         condition: service_healthy
@@ -209,6 +209,8 @@ services:
       DATABASE_URL: postgres://postgres:postgres@catalog:5432/postgres
       PEERDB_FLOW_SERVER_HTTP: http://flow_api:8113
       PEERDB_PASSWORD:
+    depends_on:
+      - flow-api
 
 volumes:
   pgdata:

docker-compose.yml

@@ -37,7 +37,7 @@ services:
     volumes:
       - pgdata:/var/lib/postgresql/data
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready", "-d", "postgres", "-U", "postgres"]
+      test: ["CMD", "pg_isready", "-d", "postgres", "-U", "postgres"]
       interval: 10s
       timeout: 30s
       retries: 5
@@ -112,7 +112,7 @@ services:
     container_name: flow-snapshot-worker
     image: ghcr.io/peerdb-io/flow-snapshot-worker:latest-dev
     environment:
-      <<: [*flow-worker-env]
+      <<: [*catalog-config, *flow-worker-env]
     depends_on:
       temporal-admin-tools:
         condition: service_healthy
@@ -174,6 +174,8 @@ services:
       <<: *catalog-config
       DATABASE_URL: postgres://postgres:postgres@catalog:5432/postgres
       PEERDB_FLOW_SERVER_HTTP: http://flow_api:8113
+    depends_on:
+      - flow-api
 
 volumes:
   pgdata:

flow/.golangci.yml

@@ -21,8 +21,12 @@ linters:
 linters-settings:
   forbidigo:
     tests: false
+  stylecheck:
+    checks:
+      - all
+      - '-ST1003'
   lll:
-    line-length: 120
+    line-length: 144
     tab-width: 4
   revive:
     rules: