Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5ee5dfe122 |
@@ -32,12 +32,17 @@ jobs:
|
|||||||
run: cargo check -p mem-ingest 2>&1 | tail -20 || true
|
run: cargo check -p mem-ingest 2>&1 | tail -20 || true
|
||||||
|
|
||||||
- name: Get short SHA
|
- name: Get short SHA
|
||||||
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
|
|
||||||
id: sha
|
id: sha
|
||||||
run: echo "short_sha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
|
run: echo "short_sha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
|
- name: Build Docker image
|
||||||
|
run: |
|
||||||
|
docker build --no-cache --progress=plain \
|
||||||
|
-t "${IMAGE}:${{ steps.sha.outputs.short_sha }}" \
|
||||||
|
-t "${IMAGE}:latest" \
|
||||||
|
-f Dockerfile .
|
||||||
|
|
||||||
- name: Registry login
|
- name: Registry login
|
||||||
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
|
|
||||||
run: |
|
run: |
|
||||||
echo "${REGISTRY_TOKEN}" | docker login "${REGISTRY}" \
|
echo "${REGISTRY_TOKEN}" | docker login "${REGISTRY}" \
|
||||||
--username "${REGISTRY_USER}" --password-stdin
|
--username "${REGISTRY_USER}" --password-stdin
|
||||||
@@ -45,21 +50,11 @@ jobs:
|
|||||||
REGISTRY_USER: ${{ secrets.FORGEJO_REGISTRY_USER }}
|
REGISTRY_USER: ${{ secrets.FORGEJO_REGISTRY_USER }}
|
||||||
REGISTRY_TOKEN: ${{ secrets.FORGEJO_REGISTRY_TOKEN }}
|
REGISTRY_TOKEN: ${{ secrets.FORGEJO_REGISTRY_TOKEN }}
|
||||||
|
|
||||||
- name: Build Docker image
|
|
||||||
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
|
|
||||||
run: |
|
|
||||||
docker build --no-cache \
|
|
||||||
-t "${IMAGE}:${{ steps.sha.outputs.short_sha }}" \
|
|
||||||
-t "${IMAGE}:latest" \
|
|
||||||
-f Dockerfile .
|
|
||||||
|
|
||||||
- name: Push Docker image
|
- name: Push Docker image
|
||||||
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
|
|
||||||
run: |
|
run: |
|
||||||
docker push "${IMAGE}:${{ steps.sha.outputs.short_sha }}"
|
docker push "${IMAGE}:${{ steps.sha.outputs.short_sha }}"
|
||||||
docker push "${IMAGE}:latest"
|
docker push "${IMAGE}:latest"
|
||||||
echo "✓ Pushed: ${IMAGE}:${{ steps.sha.outputs.short_sha }}"
|
echo "✓ Pushed: ${IMAGE}:${{ steps.sha.outputs.short_sha }}"
|
||||||
|
|
||||||
- name: Prune unused images
|
- name: Prune unused images
|
||||||
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
|
|
||||||
run: docker image prune -a --force 2>&1 | tail -3 || true
|
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)
|
# Multi-stage build for Poimen Memory Service (Rust)
|
||||||
|
|
||||||
# Stage 1: Builder
|
# Stage 1: Builder
|
||||||
FROM rust:1.81-bookworm as builder
|
FROM rust:1-bookworm as builder
|
||||||
|
|
||||||
WORKDIR /build
|
WORKDIR /build
|
||||||
|
|
||||||
# Copy source
|
# Copy source
|
||||||
COPY . .
|
COPY . .
|
||||||
|
|
||||||
# Build in release mode
|
# Build the mem binary (offline mode - no DATABASE_URL needed)
|
||||||
RUN cargo build --release
|
ENV SQLX_OFFLINE=true
|
||||||
|
RUN cargo build --release -p mem-cli
|
||||||
|
|
||||||
# Stage 2: Runtime
|
# Stage 2: Runtime
|
||||||
FROM debian:bookworm-slim
|
FROM debian:bookworm-slim
|
||||||
|
|||||||
@@ -111,28 +111,28 @@ impl EntityVersioningService {
|
|||||||
let mut modified = Vec::new();
|
let mut modified = Vec::new();
|
||||||
|
|
||||||
// Check removed and modified
|
// Check removed and modified
|
||||||
if let Some(from) = from_obj {
|
if let Some(ref from) = from_obj {
|
||||||
for (key, from_val) in from {
|
for (key, from_val) in from {
|
||||||
if let Some(to) = &to_obj {
|
if let Some(to) = &to_obj {
|
||||||
if let Some(to_val) = to.get(&key) {
|
if let Some(to_val) = to.get(key) {
|
||||||
if from_val != *to_val {
|
if from_val != to_val {
|
||||||
modified.push(DiffField {
|
modified.push(DiffField {
|
||||||
name: key,
|
name: key.clone(),
|
||||||
from_value: Some(from_val),
|
from_value: Some(from_val.clone()),
|
||||||
to_value: Some(to_val.clone()),
|
to_value: Some(to_val.clone()),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
removed.push(DiffField {
|
removed.push(DiffField {
|
||||||
name: key,
|
name: key.clone(),
|
||||||
from_value: Some(from_val),
|
from_value: Some(from_val.clone()),
|
||||||
to_value: None,
|
to_value: None,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
removed.push(DiffField {
|
removed.push(DiffField {
|
||||||
name: key,
|
name: key.clone(),
|
||||||
from_value: Some(from_val),
|
from_value: Some(from_val.clone()),
|
||||||
to_value: None,
|
to_value: None,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -301,28 +301,28 @@ fn compute_diff(
|
|||||||
let mut removed = Vec::new();
|
let mut removed = Vec::new();
|
||||||
let mut modified = 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 {
|
for (key, from_val) in from {
|
||||||
if let Some(to) = &to_obj {
|
if let Some(to) = &to_obj {
|
||||||
if let Some(to_val) = to.get(&key) {
|
if let Some(to_val) = to.get(key) {
|
||||||
if from_val != *to_val {
|
if from_val != to_val {
|
||||||
modified.push(DiffField {
|
modified.push(DiffField {
|
||||||
name: key,
|
name: key.clone(),
|
||||||
from_value: Some(from_val),
|
from_value: Some(from_val.clone()),
|
||||||
to_value: Some(to_val.clone()),
|
to_value: Some(to_val.clone()),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
removed.push(DiffField {
|
removed.push(DiffField {
|
||||||
name: key,
|
name: key.clone(),
|
||||||
from_value: Some(from_val),
|
from_value: Some(from_val.clone()),
|
||||||
to_value: None,
|
to_value: None,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
removed.push(DiffField {
|
removed.push(DiffField {
|
||||||
name: key,
|
name: key.clone(),
|
||||||
from_value: Some(from_val),
|
from_value: Some(from_val.clone()),
|
||||||
to_value: None,
|
to_value: None,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user