Restructure into Wiki, Studio and Python monorepo with scoped CI
This commit is contained in:
@@ -1,20 +0,0 @@
|
||||
import { readdir,readFile } from "node:fs/promises";
|
||||
import { db } from "../src/lib/db";
|
||||
import { ensureBucket } from "../src/lib/storage";
|
||||
import { setTimeout } from "node:timers/promises";
|
||||
async function main(){
|
||||
for(let i=0;;i++){try{await db().query('SELECT 1');break;}catch(e){if(i>=60)throw e;await setTimeout(2000);}}
|
||||
const client=await db().connect();
|
||||
try{
|
||||
await client.query('SELECT pg_advisory_lock(18131001)');
|
||||
for(const name of (await readdir('db')).filter(n=>n.endsWith('.sql')).sort()){
|
||||
const present=await client.query("SELECT to_regclass('public.schema_migrations') AS table");
|
||||
if(present.rows[0].table && (await client.query('SELECT 1 FROM schema_migrations WHERE version=$1',[name.replace('.sql','')])).rowCount)continue;
|
||||
await client.query(await readFile('db/'+name,'utf8'));console.log('Applied migration '+name);
|
||||
}
|
||||
}catch(error){await client.query('ROLLBACK');throw error;}
|
||||
finally{await client.query('SELECT pg_advisory_unlock(18131001)');client.release();}
|
||||
for(let i=0;;i++){try{await ensureBucket();break;}catch(e){if(i>=90)throw e;await setTimeout(2000);}}
|
||||
console.log('PostgreSQL and S3 are ready');await db().end();
|
||||
}
|
||||
main().catch(error=>{console.error('Storage bootstrap failed:',error instanceof Error?error.message:'Unknown error');process.exit(1);});
|
||||
@@ -1,9 +0,0 @@
|
||||
try {
|
||||
const port = process.env.PORT || '3000';
|
||||
const [health, ready] = await Promise.all([
|
||||
fetch(`http://127.0.0.1:${port}/api/health`, { signal: AbortSignal.timeout(5000) }),
|
||||
fetch(`http://127.0.0.1:${port}/api/ready`, { signal: AbortSignal.timeout(5000) }),
|
||||
]);
|
||||
const data = await health.json();
|
||||
if (!health.ok || !ready.ok || data.service !== 'prompt' || data.release !== (process.env.RELEASE_SHA || 'development')) process.exit(1);
|
||||
} catch { process.exit(1); }
|
||||
@@ -0,0 +1,7 @@
|
||||
#!/usr/bin/env bash
|
||||
set -Eeuo pipefail
|
||||
sha=${1:?release SHA required}
|
||||
[[ "$sha" =~ ^[0-9a-f]{40}$ ]]
|
||||
# Batch tool: publish a runnable image; no idle web service is needed.
|
||||
docker run --rm "prompt-python:$sha" --help
|
||||
docker tag "prompt-python:$sha" prompt-python:latest
|
||||
@@ -0,0 +1,21 @@
|
||||
#!/usr/bin/env bash
|
||||
set -Eeuo pipefail
|
||||
if [ "$(id -u)" -ne 0 ]; then exec sudo -n bash "$0" "$@"; fi
|
||||
sha=${1:?release SHA required}
|
||||
[[ "$sha" =~ ^[0-9a-f]{40}$ ]]
|
||||
exec 9>/var/lock/prompt-studio.lock
|
||||
flock -w 300 9
|
||||
latest=$(git -c safe.directory="$PWD" ls-remote origin refs/heads/main | cut -f1)
|
||||
[ "$latest" = "$sha" ] || exit 0
|
||||
mkdir -p /opt/prompt-studio
|
||||
previous=$(cat /opt/prompt-studio/image 2>/dev/null || true)
|
||||
write_compose(){ printf 'services:\n studio:\n image: %s\n restart: unless-stopped\n ports: ["18134:3000"]\n' "$1" > /opt/prompt-studio/compose.yml; }
|
||||
write_compose "prompt-studio:$sha"
|
||||
rollback(){ if [ -n "$previous" ]; then write_compose "$previous"; docker compose -p prompt-studio -f /opt/prompt-studio/compose.yml up -d; fi; }
|
||||
trap rollback ERR
|
||||
docker compose -p prompt-studio -f /opt/prompt-studio/compose.yml up -d
|
||||
for attempt in {1..40}; do
|
||||
if curl -fsS http://127.0.0.1:18134/api/index >/dev/null; then printf '%s' "prompt-studio:$sha" > /opt/prompt-studio/image; exit 0; fi
|
||||
sleep 2
|
||||
done
|
||||
false
|
||||
@@ -1,92 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
set -Eeuo pipefail
|
||||
if [ "$(id -u)" -ne 0 ]; then exec sudo -n bash "$0" "$@"; fi
|
||||
SHA=${1:?Release SHA is required}
|
||||
[[ "$SHA" =~ ^[0-9a-f]{40}$ ]] || exit 1
|
||||
ROOT=/opt/prompt
|
||||
PREVIOUS=$(readlink -f "$ROOT/current")
|
||||
test -f "$PREVIOUS/compose.yml"
|
||||
BASE=$(sed -n 's/^RELEASE_SHA=//p' "$PREVIOUS/release.env")
|
||||
test "$(git -c safe.directory="$PWD" rev-parse HEAD)" = "$SHA"
|
||||
# Never let a manually invoked fast release bypass the change policy.
|
||||
export GIT_CONFIG_COUNT=1 GIT_CONFIG_KEY_0=safe.directory GIT_CONFIG_VALUE_0="$PWD"
|
||||
test "$(bash scripts/release-mode.sh "$BASE")" = web
|
||||
IMAGE=$(sed -n 's/^PROMPT_IMAGE=//p' "$PREVIOUS/release.env")
|
||||
[[ "$IMAGE" =~ ^prompt:[0-9a-f]{40}$ ]] || exit 1
|
||||
BUILDER="prompt-tests:${IMAGE#prompt:}"
|
||||
docker image inspect "$BUILDER" >/dev/null
|
||||
RELEASE="$ROOT/releases/$SHA"
|
||||
CACHE="$ROOT/web-cache/${IMAGE#prompt:}"
|
||||
mkdir -p "$ROOT/web-artifacts" "$ROOT/web-cache" "$ROOT/releases"
|
||||
exec 8>"$ROOT/.web-build.lock"
|
||||
flock -w 300 8
|
||||
# Build away from the running application. Only the compiler cache is shared.
|
||||
ARTIFACT=$(mktemp -d "$ROOT/web-artifacts/$SHA.XXXXXX")
|
||||
mkdir -p "$CACHE"
|
||||
CONTAINER="prompt-web-build-$SHA"
|
||||
cleanup(){ docker rm -f "$CONTAINER" >/dev/null 2>&1 || true; }
|
||||
trap cleanup EXIT
|
||||
# The existing validated test image contains the matching Node/toolchain/dependencies.
|
||||
# Replacing source in a disposable container does not commit/export image layers.
|
||||
docker run --name "$CONTAINER" --user 0:0 \
|
||||
--mount "type=bind,src=$PWD,dst=/source,readonly" \
|
||||
--mount "type=bind,src=$ARTIFACT,dst=/output" \
|
||||
--mount "type=bind,src=$CACHE,dst=/app/.next/cache" \
|
||||
--entrypoint bash "$BUILDER" -ceu '
|
||||
cd /app
|
||||
rm -rf src public scripts tests db seed
|
||||
cp -a /source/src /source/public /source/scripts /source/tests /source/db /source/seed ./
|
||||
cp /source/package.json /source/package-lock.json /source/tsconfig.json /source/next-env.d.ts /source/next.config.ts /source/postcss.config.mjs ./
|
||||
npm run typecheck
|
||||
npm test
|
||||
node node_modules/next/dist/bin/next build
|
||||
node scripts/prepare-standalone.mjs
|
||||
npm run test:smoke
|
||||
cp -a .next/standalone/. /output/
|
||||
chmod -R a+rX /output
|
||||
'
|
||||
cleanup
|
||||
# Serialize cutover with full deployments and recheck the running release.
|
||||
exec 9>"$ROOT/.deploy.lock"
|
||||
flock -w 300 9
|
||||
test "$(readlink -f "$ROOT/current")" = "$PREVIOUS"
|
||||
LATEST=$(git -c safe.directory="$PWD" ls-remote origin refs/heads/main | cut -f1)
|
||||
if [ "$LATEST" != "$SHA" ]; then echo 'Skipping stale Web release'; exit 0; fi
|
||||
mkdir -p "$RELEASE"
|
||||
cp "$PREVIOUS/release.env" "$RELEASE/release.env"
|
||||
sed -i "s/^RELEASE_SHA=.*/RELEASE_SHA=$SHA/" "$RELEASE/release.env"
|
||||
cat > "$RELEASE/web.override.yml" <<YAML
|
||||
services:
|
||||
web:
|
||||
command: ["node", "/web/server.js"]
|
||||
volumes:
|
||||
- type: bind
|
||||
source: $ARTIFACT
|
||||
target: /web
|
||||
read_only: true
|
||||
YAML
|
||||
# Preserve variable expressions: never materialize production secrets into release files.
|
||||
docker compose -p prompt -f "$PREVIOUS/compose.yml" -f "$RELEASE/web.override.yml" config --no-interpolate > "$RELEASE/compose.yml"
|
||||
compose_at(){ local dir="$1"; shift; env -u PROMPT_IMAGE -u PROMPT_TEST_IMAGE -u RELEASE_SHA -u WEB_PORT -u WEB_BIND_ADDRESS docker compose -p prompt --env-file /etc/prompt.env --env-file "$dir/release.env" -f "$dir/compose.yml" "$@"; }
|
||||
CUTOVER=0
|
||||
rollback(){
|
||||
code=$?
|
||||
trap - ERR
|
||||
if [ "$CUTOVER" -eq 1 ]; then compose_at "$PREVIOUS" up -d --no-deps --no-build --wait --wait-timeout 120 web || true; fi
|
||||
exit "$code"
|
||||
}
|
||||
trap rollback ERR
|
||||
CUTOVER=1
|
||||
compose_at "$RELEASE" up -d --no-deps --no-build --wait --wait-timeout 120 web
|
||||
compose_at "$RELEASE" exec -T web node /app/container-health.mjs
|
||||
compose_at "$RELEASE" exec -T web node -e '
|
||||
(async()=>{
|
||||
for(const path of ["/", "/agent/index.md", "/tools/skills"]){
|
||||
const r=await fetch("http://127.0.0.1:3000"+path);
|
||||
if(!r.ok)throw Error(path+" returned "+r.status);
|
||||
if(path.endsWith(".md")&&!r.headers.get("content-type")?.includes("text/markdown"))throw Error("Expected Markdown");
|
||||
}
|
||||
})().catch(e=>{console.error(e.message);process.exit(1)})'
|
||||
ln -sfn "$RELEASE" "$ROOT/.current.next"
|
||||
mv -Tf "$ROOT/.current.next" "$ROOT/current"
|
||||
echo "Web-only release verified: $SHA; runtime image=$IMAGE; worker and infrastructure unchanged"
|
||||
@@ -1,29 +0,0 @@
|
||||
import {readFile,readdir} from 'node:fs/promises';
|
||||
import {fileURLToPath} from 'node:url';
|
||||
import {join,dirname} from 'node:path';
|
||||
const root=join(dirname(fileURLToPath(import.meta.url)),'..','seed','characters');
|
||||
const base=process.env.PROMPT_IMPORT_BASE_URL||'http://127.0.0.1:3000';
|
||||
const packs=JSON.parse(await readFile(join(root,'packs.json'),'utf8'));
|
||||
async function verify(pack){
|
||||
const response=await fetch(`${base}/api/feed?section=images&q=${encodeURIComponent(pack.title)}`);
|
||||
if(!response.ok)throw new Error(`Cannot verify feed: ${response.status}`);
|
||||
const post=(await response.json()).posts.find(p=>p.slug===pack.slug);
|
||||
const images=post?.assets.filter(a=>a.kind==='image');
|
||||
if(images?.length!==pack.count)throw new Error(`Wrong image count for ${pack.slug}`);
|
||||
for(const image of images){const media=await fetch(`${base}/api/media/${image.id}`,{method:'HEAD'});if(!media.ok||media.headers.get('content-type')!=='image/png')throw new Error(`Missing PNG ${image.id}`);}
|
||||
console.log(`Verified: /p/${pack.slug} (${images.length} stored PNGs)`);
|
||||
}
|
||||
for(const pack of packs){
|
||||
const existing=await fetch(`${base}/p/${pack.slug}`);
|
||||
if(existing.ok){console.log(`Already imported: /p/${pack.slug}`);await verify(pack);continue;}
|
||||
if(existing.status!==404)throw new Error(`Cannot check pack ${pack.slug}: ${existing.status}`);
|
||||
const files=(await readdir(join(root,pack.directory))).filter(n=>n.endsWith('.png')).sort();
|
||||
if(files.length!==pack.count)throw new Error(`Expected ${pack.count} PNGs for ${pack.slug}, got ${files.length}`);
|
||||
const data=new FormData();data.set('title',pack.title);data.set('slug',pack.slug);data.set('description',pack.description);
|
||||
for(const file of files)data.append('files',new Blob([await readFile(join(root,pack.directory,file))],{type:'image/png'}),file);
|
||||
const response=await fetch(`${base}/api/skills/street-people`,{method:'POST',body:data});
|
||||
if(response.status!==201&&response.status!==409)throw new Error(`Import ${pack.slug}: ${response.status} ${await response.text()}`);
|
||||
if(response.status===409&&!(await fetch(`${base}/p/${pack.slug}`)).ok)throw new Error(`Conflicting import ${pack.slug}`);
|
||||
console.log(`Imported: /p/${pack.slug} (${files.length} transparent PNGs)`);
|
||||
await verify(pack);
|
||||
}
|
||||
@@ -1,4 +0,0 @@
|
||||
import { cp,mkdir,access } from 'node:fs/promises';
|
||||
await mkdir('.next/standalone/.next',{recursive:true});
|
||||
await cp('.next/static','.next/standalone/.next/static',{recursive:true});
|
||||
try{await access('public');await cp('public','.next/standalone/public',{recursive:true});}catch(e){if(e.code!=='ENOENT')throw e;}
|
||||
@@ -1,5 +0,0 @@
|
||||
import { db } from "../src/lib/db";
|
||||
import { publishLearningSeries } from "../src/lib/publish-learning-series";
|
||||
publishLearningSeries().then(result=>console.log(`Published learning series: ${result.published.join(", ")}; one shared cover: ${result.coverId}`))
|
||||
.catch(error=>{console.error("Learning series publication failed:",error instanceof Error?error.message:"Unknown error");process.exitCode=1;})
|
||||
.finally(()=>db().end());
|
||||
@@ -1,20 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
set -Eeuo pipefail
|
||||
# Compare to what is running, not HEAD^: include failed or skipped releases.
|
||||
ROOT=${PROMPT_ROOT:-/opt/prompt}
|
||||
BASE=${1:-}
|
||||
if [ -z "$BASE" ] && [ -f "$ROOT/current/release.env" ]; then
|
||||
BASE=$(sed -n 's/^RELEASE_SHA=//p' "$ROOT/current/release.env")
|
||||
fi
|
||||
if ! [[ "$BASE" =~ ^[0-9a-f]{40}$ ]] || ! git cat-file -e "$BASE^{commit}" 2>/dev/null; then echo full; exit; fi
|
||||
if ! git merge-base --is-ancestor "$BASE" HEAD; then echo full; exit; fi
|
||||
CHANGED=0
|
||||
while IFS= read -r -d '' file; do
|
||||
CHANGED=1
|
||||
case "$file" in
|
||||
src/pages/api/*) echo full; exit;;
|
||||
src/pages/*|src/components/*|src/styles/*|src/content/skills/*|public/*) ;;
|
||||
*) echo full; exit;;
|
||||
esac
|
||||
done < <(git diff --no-renames --name-only -z "$BASE" HEAD)
|
||||
if [ "$CHANGED" -eq 0 ]; then echo full; else echo web; fi
|
||||
@@ -1,44 +0,0 @@
|
||||
import { spawn } from "node:child_process";
|
||||
import assert from "node:assert/strict";
|
||||
import { setTimeout } from "node:timers/promises";
|
||||
import { createServer } from "node:net";
|
||||
import { once } from "node:events";
|
||||
|
||||
async function availablePort() {
|
||||
const server = createServer();
|
||||
server.listen(0, "127.0.0.1");
|
||||
await once(server, "listening");
|
||||
const port = server.address().port;
|
||||
await new Promise((resolve, reject) => server.close(error => error ? reject(error) : resolve()));
|
||||
return String(port);
|
||||
}
|
||||
|
||||
const port = process.env.SMOKE_PORT || await availablePort();
|
||||
const release = "smoke-test";
|
||||
const child = spawn(process.execPath, [".next/standalone/server.js"], {
|
||||
env: { ...process.env, PORT: port, HOSTNAME: "127.0.0.1", RELEASE_SHA: release },
|
||||
stdio: "inherit",
|
||||
});
|
||||
try {
|
||||
let ready = false;
|
||||
for (let i = 0; i < 40; i++) {
|
||||
if (child.exitCode !== null) throw new Error(`Server exited: ${child.exitCode}`);
|
||||
try {
|
||||
const response = await fetch(`http://127.0.0.1:${port}/api/health`);
|
||||
assert.equal(response.status, 200);
|
||||
assert.deepEqual(await response.json(), { status: "ok", service: "prompt", release });
|
||||
ready = true;
|
||||
break;
|
||||
} catch { await setTimeout(500); }
|
||||
}
|
||||
assert.ok(ready, "Standalone production server must be healthy");
|
||||
const response = await fetch(`http://127.0.0.1:${port}/api/health`, { method: "POST" });
|
||||
assert.equal(response.status, 405);
|
||||
console.log("Production smoke test passed");
|
||||
} finally {
|
||||
if (child.exitCode === null && child.signalCode === null) {
|
||||
const exited = once(child, "exit");
|
||||
child.kill("SIGTERM");
|
||||
await exited;
|
||||
}
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
const slugs=['learning-skills-notes','learning-skills-teaching','learning-skills-english'];
|
||||
for(let attempt=0;attempt<120;attempt++){
|
||||
const states=await Promise.all(slugs.map(async slug=>{const r=await fetch('http://127.0.0.1:3000/api/posts/'+slug+'/snapshots');if(!r.ok)throw Error('Screenshot state unavailable');return r.json()}));
|
||||
const failed=states.find(s=>s.job?.status==='failed');if(failed)throw Error(failed.job.error||'Screenshot generation failed');
|
||||
if(states.every(s=>s.job?.status==='ready'&&s.job.revision===process.env.RELEASE_SHA&&s.pages.length===8&&s.pages.every(p=>p.revision===process.env.RELEASE_SHA))){console.log('Verified 24 current server-rendered page snapshots');process.exit(0)}
|
||||
await new Promise(r=>setTimeout(r,2000));
|
||||
}
|
||||
throw Error('Screenshot publication timed out');
|
||||
Reference in New Issue
Block a user