Verified Commit 3639bfcf authored by Camil Staps's avatar Camil Staps 🚀

Use db.jsonl instead of types.json for database

parent f1d1ef31
Pipeline #42825 passed with stages
in 12 minutes and 54 seconds
......@@ -10,7 +10,7 @@ builddb
CloogleServer
rank_settings.json
types.json
db.jsonl
typetree.dot
cloogle.log
......
......@@ -22,7 +22,7 @@ backend:
artifacts:
paths:
- backend/rank_settings.json
- backend/types.json
- backend/db.jsonl
- backend/typetree.dot
frontend:
......
......@@ -190,7 +190,7 @@ Start w
= w
# opts = fromOk opts
# w = disableSwap w
#! (_,f,w) = fopen "types.json" FReadText w
#! (_,f,w) = fopen "db.jsonl" FReadText w
#! (db,f) = openDB f
#! (ok,db) = isJustU db
| not ok = errexit "Could not open database\n" -1 w
......
......@@ -13,7 +13,7 @@ RUN apt-get update -qq &&\
apt-get install -qq libc6-i386 &&\
rm -rf /var/lib/apt/lists
COPY --from=builder /usr/src/cloogle/CloogleServer /usr/src/cloogle/CloogleServer
COPY --from=builder /usr/src/cloogle/types.json /usr/src/cloogle/types.json
COPY --from=builder /usr/src/cloogle/db.jsonl /usr/src/cloogle/db.jsonl
COPY --from=builder /usr/src/cloogle/rank_settings.json /usr/src/cloogle/rank_settings.json
COPY --from=builder /usr/src/cloogle/typetree.dot /usr/src/cloogle/typetree.dot
COPY backend/serve /usr/src/cloogle/serve
......
SHELL:=bash
BIN:=builddb CloogleServer
DB=types.json
DB=db.jsonl
.PHONY: all clean .FORCE
......
......@@ -12,5 +12,5 @@ make clean CloogleServer builddb
if [ ! -f libs.json ]; then ln -s ../libs.json; fi
../util/fetch_libs.sh /opt/clean/lib
./builddb > types.json
./builddb > db.jsonl
./CloogleServer --rank-settings-constraints rank_settings_constraints.json > rank_settings.json
......@@ -90,7 +90,7 @@ if [[ "$RELEASE_DIRECTORY" != "" ]]; then
| sed -n '/^\.\/builddb /{:a;n;/^Execution: /{p;b};p;ba}' \
> "$THIS_RELEASE/build-log.txt"
timeout -k 10 10 sudo docker-compose exec -T backend cat rank_settings.json > "$THIS_RELEASE/rank_settings.json" || echo "could not publish rank settings"
timeout -k 10 10 sudo docker-compose exec -T backend cat types.json > "$THIS_RELEASE/types.json" || echo "could not publish database"
timeout -k 10 10 sudo docker-compose exec -T backend cat db.jsonl > "$THIS_RELEASE/db.jsonl" || echo "could not publish database"
timeout -k 10 10 sudo docker-compose exec -T backend cat typetree.dot > "$THIS_RELEASE/typetree.dot" || echo "could not publish type tree"
fi
echo -en "\033[0m"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment