Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5ee5dfe122 | ||
|
|
6e4f234d8f | ||
|
|
29d6ab72d1 |
@@ -1,30 +0,0 @@
|
||||
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 }}
|
||||
+16
-74
@@ -2,94 +2,47 @@ name: CI
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
branches: [main]
|
||||
pull_request:
|
||||
branches:
|
||||
- main
|
||||
branches: [main]
|
||||
workflow_dispatch:
|
||||
|
||||
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: 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
|
||||
- name: Install Node.js and Docker
|
||||
run: |
|
||||
apt-get update
|
||||
apt-get install -y docker.io
|
||||
apt-get install -y nodejs 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: Pre-verify Docker and Registry
|
||||
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
|
||||
- name: Get short SHA
|
||||
id: sha
|
||||
run: echo "short_sha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Build Docker image
|
||||
run: |
|
||||
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 }}
|
||||
docker build --no-cache --progress=plain \
|
||||
-t "${IMAGE}:${{ steps.sha.outputs.short_sha }}" \
|
||||
-t "${IMAGE}:latest" \
|
||||
-f Dockerfile .
|
||||
|
||||
- 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
|
||||
@@ -97,22 +50,11 @@ 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 "✓ Image pushed: ${IMAGE}:${{ steps.sha.outputs.short_sha }}"
|
||||
echo "✓ 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
|
||||
|
||||
+4
-3
@@ -1,15 +1,16 @@
|
||||
# Multi-stage build for Poimen Memory Service (Rust)
|
||||
|
||||
# Stage 1: Builder
|
||||
FROM rust:1.81-bookworm as builder
|
||||
FROM rust:1-bookworm as builder
|
||||
|
||||
WORKDIR /build
|
||||
|
||||
# Copy source
|
||||
COPY . .
|
||||
|
||||
# Build in release mode
|
||||
RUN cargo build --release
|
||||
# Build the mem binary (offline mode - no DATABASE_URL needed)
|
||||
ENV SQLX_OFFLINE=true
|
||||
RUN cargo build --release -p mem-cli
|
||||
|
||||
# Stage 2: Runtime
|
||||
FROM debian:bookworm-slim
|
||||
|
||||
@@ -100,4 +100,3 @@ See `config/default.toml` for:
|
||||
|
||||
See `CLAUDE.md` for project context and constraints.
|
||||
# CI test 1788759975
|
||||
# CI trigger 1788795205
|
||||
|
||||
@@ -111,28 +111,28 @@ impl EntityVersioningService {
|
||||
let mut modified = Vec::new();
|
||||
|
||||
// Check removed and modified
|
||||
if let Some(from) = from_obj {
|
||||
if let Some(ref 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,
|
||||
from_value: Some(from_val),
|
||||
name: key.clone(),
|
||||
from_value: Some(from_val.clone()),
|
||||
to_value: Some(to_val.clone()),
|
||||
});
|
||||
}
|
||||
} else {
|
||||
removed.push(DiffField {
|
||||
name: key,
|
||||
from_value: Some(from_val),
|
||||
name: key.clone(),
|
||||
from_value: Some(from_val.clone()),
|
||||
to_value: None,
|
||||
});
|
||||
}
|
||||
} else {
|
||||
removed.push(DiffField {
|
||||
name: key,
|
||||
from_value: Some(from_val),
|
||||
name: key.clone(),
|
||||
from_value: Some(from_val.clone()),
|
||||
to_value: None,
|
||||
});
|
||||
}
|
||||
@@ -301,28 +301,28 @@ fn compute_diff(
|
||||
let mut removed = Vec::new();
|
||||
let mut modified = Vec::new();
|
||||
|
||||
if let Some(from) = from_obj {
|
||||
if let Some(ref 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,
|
||||
from_value: Some(from_val),
|
||||
name: key.clone(),
|
||||
from_value: Some(from_val.clone()),
|
||||
to_value: Some(to_val.clone()),
|
||||
});
|
||||
}
|
||||
} else {
|
||||
removed.push(DiffField {
|
||||
name: key,
|
||||
from_value: Some(from_val),
|
||||
name: key.clone(),
|
||||
from_value: Some(from_val.clone()),
|
||||
to_value: None,
|
||||
});
|
||||
}
|
||||
} else {
|
||||
removed.push(DiffField {
|
||||
name: key,
|
||||
from_value: Some(from_val),
|
||||
name: key.clone(),
|
||||
from_value: Some(from_val.clone()),
|
||||
to_value: None,
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user