# HG changeset patch # User ellis # Date 1704299949 18000 # Node ID 927ac4b908ce72540a6899db6a1de84a1df4571f # Parent 276ac5b5d1fa369c567db7e6a207096f14ac0cec testing diff -r 276ac5b5d1fa -r 927ac4b908ce makefile --- a/makefile Tue Jan 02 23:16:44 2024 -0500 +++ b/makefile Wed Jan 03 11:39:09 2024 -0500 @@ -19,6 +19,7 @@ SRC:=comp HG_COMMIT:=$(shell hg id -i) +worker:rocksdb-install sbcl-install ts-langs-install emacs-install quicklisp-install # init:sbcl rust emacs rocksdb comp virt; # dist/linux dist/rust dist/bundle all:dist/cdn dist/comp dist/lisp dist/rust dist/sbcl dist/rocksdb dist/emacs @@ -171,7 +172,7 @@ mkdir -pv $@ $< "$@/std.core" $< "$@/prelude.core" "(mapc #'ql:quickload \ - (list :nlp :rdb :organ :packy :skel :obj :net :parse :pod :dat :log :packy :rt :syn :xdb))" + (list :nlp :rdb :organ :packy :skel :obj :net :parse :pod :dat :log :packy :rt :syn :xdb :doc :vc :rt))" dist/lisp/bin:scripts/sbcl-make-bin.sh comp $< bin/skel diff -r 276ac5b5d1fa -r 927ac4b908ce virt/build-ci-worker.sh --- a/virt/build-ci-worker.sh Tue Jan 02 23:16:44 2024 -0500 +++ b/virt/build-ci-worker.sh Wed Jan 03 11:39:09 2024 -0500 @@ -5,18 +5,16 @@ id=$(buildah from alpine-base) buildah add $id etc/skel /etc/skel -buildah run $id adduser alik -D -k /etc/skel -buildah run $id adduser demon -D -k /etc/skel +buildah run $id adduser worker -D buildah run $id apk add build-base zstd-dev sbcl curl make git linux-headers cargo openssl perl llvm -buildah config --workingdir /home/demon $id -buildah config --volume /mnt/y $id +buildah run $id mkdir /store +buildah run $id mkdir /stash +buildah config --volume /store $id buildah run --net host $id hg clone https://vc.compiler.company/comp/infra -buildah run --net host $id sh -c 'make -C infra rocksdb-install' -buildah run --net host $id sh -c 'make -C infra sbcl-install' -buildah run --net host $id sh -c 'make -C infra ts-langs-install' -buildah run --net host $id sh -c 'make -C infra dist/lisp/fasl' -buildah run --net host $id sh -c 'mv infra/dist/lisp/fasl/* /usr/local/lib/sbcl/' -buildah run --net host $id sh -c './infra/scripts/install-cargo-tools.sh' -buildah run --net host $id sh -c 'make -C infra clean' -buildah config --entrypoint '["/usr/local/bin/sbcl", "--core", "/usr/local/lib/sbcl/prelude.fasl"]' $id +buildah config --workingdir $id infra +buildah run --net host $id sh -c 'make worker' +buildah run --net host $id sh -c 'scripts/install-cargo-tools.sh' +buildah run --net host $id sh -c 'make clean' +buildah config --entrypoint '["/usr/local/bin/sbcl"]' $id +buildah config --workingdir /stash buildah commit $id ci-worker