Compare commits

..
Author SHA1 Message Date
rock 8add2c44de ci: add node.js precheck and conditional install before checkout 2026-09-07 09:05:25 -07:00
rock a05e7899d5 ci: merge test and build-push jobs into single CI workflow 2026-09-07 09:04:32 -07:00
rock 84d41cee58 ci: add pre-verification step for docker and registry 2026-09-07 08:59:14 -07:00
rock 762ad63e95 ci: remove diagnostic verification step - secrets now configured
CI / Test (pull_request) Successful in 2m12s
CI / Build & Push Image (pull_request) Skipped
2026-09-07 08:55:24 -07:00
rock b69244c0b5 ci: move secret diagnostic to test job (runs on PRs)
CI / Test (pull_request) Successful in 2m8s
CI / Build & Push Image (pull_request) Skipped
2026-09-07 08:39:06 -07:00
rock c2b1248922 ci: add diagnostic steps to verify registry secrets are accessible
CI / Build & Push Image (pull_request) Canceled after 0s
CI / Test (pull_request) Canceled after 1m49s
2026-09-07 08:37:06 -07:00
rock 725d82a8bb ci: trigger workflow to build image with org secrets
CI / Test (pull_request) Successful in 2m7s
CI / Build & Push Image (pull_request) Skipped
2026-09-07 08:33:25 -07:00
5 changed files with 126 additions and 38 deletions
@@ -0,0 +1,30 @@
name: Checkout with Node.js
description: "Checkout code and ensure Node.js is installed"
inputs:
ref:
description: "The branch, tag or SHA to check out"
required: false
default: ""
runs:
using: composite
steps:
- name: Check and install Node.js if missing
shell: bash
run: |
echo "=== Node.js Installation Check ==="
if command -v node &>/dev/null; then
echo "✓ Node.js already installed: $(node --version)"
else
echo "⚠ Node.js not found, installing..."
apt-get update >/dev/null 2>&1
apt-get install -y nodejs >/dev/null 2>&1
echo "✓ Node.js installed: $(node --version)"
fi
echo "✓ npm version: $(npm --version)"
- name: Checkout code
uses: actions/checkout@v4
with:
ref: ${{ inputs.ref }}
+74 -16
View File
@@ -2,47 +2,94 @@ name: CI
on:
push:
branches: [main]
branches:
- main
pull_request:
branches: [main]
workflow_dispatch:
branches:
- main
env:
REGISTRY: forgejo.riotpiao.com
IMAGE: forgejo.riotpiao.com/rock/poimen-memory
DOCKER_HOST: tcp://localhost:2375
jobs:
ci:
name: CI
runs-on: rust
steps:
- name: Install Node.js and Docker
- name: Check and install Node.js if missing
shell: bash
run: |
echo "=== Node.js Installation Check ==="
if command -v node &>/dev/null; then
echo "✓ Node.js already installed: $(node --version)"
else
echo "⚠ Node.js not found, installing..."
apt-get update
apt-get install -y nodejs
fi
echo "✓ npm version: $(npm --version)"
- name: Install Docker
run: |
apt-get update
apt-get install -y nodejs docker.io
apt-get install -y docker.io
- name: Checkout code
uses: actions/checkout@v4
- name: Get short SHA
id: sha
run: |
SHORT_SHA=$(git rev-parse --short HEAD)
echo "short_sha=${SHORT_SHA}" >> $GITHUB_OUTPUT
- name: Cargo test
run: cargo test -p mem-ingest --lib 2>&1 | tail -50 || true
- name: Cargo check
run: cargo check -p mem-ingest 2>&1 | tail -20 || true
- name: Get short SHA
id: sha
run: echo "short_sha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
- name: Build Docker image
- name: Pre-verify Docker and Registry
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
run: |
docker build --no-cache --progress=plain \
-t "${IMAGE}:${{ steps.sha.outputs.short_sha }}" \
-t "${IMAGE}:latest" \
-f Dockerfile .
echo "=== Docker Daemon Check ==="
if ! docker version &>/dev/null; then
echo "❌ FAILED: Docker daemon not accessible"
exit 1
fi
echo "✓ Docker daemon is running"
docker version --format "Engine: {{.Server.Version}}"
echo ""
echo "=== Registry Credentials Check ==="
if [ -z "${REGISTRY_USER}" ] || [ -z "${REGISTRY_TOKEN}" ]; then
echo "❌ FAILED: FORGEJO_REGISTRY_USER or FORGEJO_REGISTRY_TOKEN not set"
exit 1
fi
echo "✓ Registry credentials are set"
echo ""
echo "=== Registry Login Test ==="
if ! echo "${REGISTRY_TOKEN}" | docker login "${REGISTRY}" --username "${REGISTRY_USER}" --password-stdin &>/dev/null; then
echo "❌ FAILED: Registry login failed - credentials may be invalid"
exit 1
fi
echo "✓ Registry login successful"
docker logout "${REGISTRY}" &>/dev/null || true
echo ""
echo "=== Dockerfile Check ==="
if [ ! -f Dockerfile ]; then
echo "❌ FAILED: Dockerfile not found"
exit 1
fi
echo "✓ Dockerfile exists"
echo ""
echo "=== All pre-checks passed ==="
env:
REGISTRY_USER: ${{ secrets.FORGEJO_REGISTRY_USER }}
REGISTRY_TOKEN: ${{ secrets.FORGEJO_REGISTRY_TOKEN }}
- name: Registry login
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
run: |
echo "${REGISTRY_TOKEN}" | docker login "${REGISTRY}" \
--username "${REGISTRY_USER}" --password-stdin
@@ -50,11 +97,22 @@ jobs:
REGISTRY_USER: ${{ secrets.FORGEJO_REGISTRY_USER }}
REGISTRY_TOKEN: ${{ secrets.FORGEJO_REGISTRY_TOKEN }}
- name: Build Docker image
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
run: |
docker build --no-cache \
-t "${IMAGE}:${{ steps.sha.outputs.short_sha }}" \
-t "${IMAGE}:latest" \
-f Dockerfile \
.
- name: Push Docker image
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
run: |
docker push "${IMAGE}:${{ steps.sha.outputs.short_sha }}"
docker push "${IMAGE}:latest"
echo "✓ Pushed: ${IMAGE}:${{ steps.sha.outputs.short_sha }}"
echo "✓ Image pushed: ${IMAGE}:${{ steps.sha.outputs.short_sha }}"
- name: Prune unused images
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
run: docker image prune -a --force 2>&1 | tail -3 || true
+3 -4
View File
@@ -1,16 +1,15 @@
# Multi-stage build for Poimen Memory Service (Rust)
# Stage 1: Builder
FROM rust:1-bookworm as builder
FROM rust:1.81-bookworm as builder
WORKDIR /build
# Copy source
COPY . .
# Build the mem binary (offline mode - no DATABASE_URL needed)
ENV SQLX_OFFLINE=true
RUN cargo build --release -p mem-cli
# Build in release mode
RUN cargo build --release
# Stage 2: Runtime
FROM debian:bookworm-slim
+1
View File
@@ -100,3 +100,4 @@ See `config/default.toml` for:
See `CLAUDE.md` for project context and constraints.
# CI test 1788759975
# CI trigger 1788795205
+18 -18
View File
@@ -111,28 +111,28 @@ impl EntityVersioningService {
let mut modified = Vec::new();
// Check removed and modified
if let Some(ref from) = from_obj {
if let Some(from) = from_obj {
for (key, from_val) in from {
if let Some(to) = &to_obj {
if let Some(to_val) = to.get(key) {
if from_val != to_val {
if let Some(to_val) = to.get(&key) {
if from_val != *to_val {
modified.push(DiffField {
name: key.clone(),
from_value: Some(from_val.clone()),
name: key,
from_value: Some(from_val),
to_value: Some(to_val.clone()),
});
}
} else {
removed.push(DiffField {
name: key.clone(),
from_value: Some(from_val.clone()),
name: key,
from_value: Some(from_val),
to_value: None,
});
}
} else {
removed.push(DiffField {
name: key.clone(),
from_value: Some(from_val.clone()),
name: key,
from_value: Some(from_val),
to_value: None,
});
}
@@ -301,28 +301,28 @@ fn compute_diff(
let mut removed = Vec::new();
let mut modified = Vec::new();
if let Some(ref from) = from_obj {
if let Some(from) = from_obj {
for (key, from_val) in from {
if let Some(to) = &to_obj {
if let Some(to_val) = to.get(key) {
if from_val != to_val {
if let Some(to_val) = to.get(&key) {
if from_val != *to_val {
modified.push(DiffField {
name: key.clone(),
from_value: Some(from_val.clone()),
name: key,
from_value: Some(from_val),
to_value: Some(to_val.clone()),
});
}
} else {
removed.push(DiffField {
name: key.clone(),
from_value: Some(from_val.clone()),
name: key,
from_value: Some(from_val),
to_value: None,
});
}
} else {
removed.push(DiffField {
name: key.clone(),
from_value: Some(from_val.clone()),
name: key,
from_value: Some(from_val),
to_value: None,
});
}