changeset 34: |
04d40f43430e |
parent 33: |
727a4cb16360 |
child 35: |
eed390084dba |
author: |
ellis <ellis@rwest.io> |
date: |
Sat, 30 Dec 2023 22:55:46 -0500 |
files: |
makefile scripts/install-cargo-tools.sh virt/build-ci-worker.sh |
description: |
added quicklisp, rm sqlx-cli |
1.1--- a/makefile Sat Dec 30 22:05:20 2023 -0500
1.2+++ b/makefile Sat Dec 30 22:55:46 2023 -0500
1.3@@ -77,11 +77,13 @@
1.4 --dynamic-space-size=8Gb \
1.5 --fancy
1.6 sbcl:$(SBCL_TARGET)
1.7-sbcl-docs:sbcl;## REQURES TEXLIVE
1.8+sbcl-docs:sbcl;## REQUIRES TEXLIVE
1.9 cd $(SBCL_TARGET)/doc/manual && make
1.10 sbcl-install:sbcl;cd $(SBCL_TARGET) && ./install.sh
1.11 clean-sbcl:$(SBCL_TARGET);cd $(SBCL_TARGET) && ./clean.sh
1.12-
1.13+build/quicklisp.lisp:;curl -o build/quicklisp.lisp -O https://beta.quicklisp.org/quicklisp.lisp
1.14+quicklisp-install:build/quicklisp.lisp
1.15+ sbcl --script $< --eval '(quicklisp-quickstart:install)'
1.16 ### Rust
1.17 RUST_TARGET:=build/src/rust
1.18 $(RUST_TARGET):scripts/get-rust.sh $(B);$<
1.19@@ -156,7 +158,7 @@
1.20
1.21 dist/emacs:emacs-build $(D);
1.22
1.23-dist/fasl:scripts/sbcl-save-core.sh
1.24+dist/fasl:scripts/sbcl-save-core.sh quicklisp-install
1.25 mkdir -pv $@
1.26 $< "$@/std.core"
1.27 $< "$@/prelude.core" "(mapc #'ql:quickload \
2.1--- a/scripts/install-cargo-tools.sh Sat Dec 30 22:05:20 2023 -0500
2.2+++ b/scripts/install-cargo-tools.sh Sat Dec 30 22:55:46 2023 -0500
2.3@@ -5,6 +5,6 @@
2.4 cargo install t-rec
2.5 cargo install trunk
2.6 cargo install tokio-console
2.7-cargo install sqlx-cli
2.8+# cargo install sqlx-cli
2.9 cargo install wasm-bindgen-cli
2.10 cargo install wasm-opt
3.1--- a/virt/build-ci-worker.sh Sat Dec 30 22:05:20 2023 -0500
3.2+++ b/virt/build-ci-worker.sh Sat Dec 30 22:55:46 2023 -0500
3.3@@ -4,13 +4,22 @@
3.4 # dedicated pod named 'ci'.
3.5
3.6 id=$(buildah from alpine-base)
3.7+buildah copy $id etc/skel /etc/skel
3.8 buildah run $id adduser alik -D
3.9-buildah run $id adduser demon -D
3.10-buildah run $id apk add zstd-dev sbcl curl make rust git linux-headers
3.11+buildah run $id adduser demon -D -k /etc/skel
3.12+buildah run $id apk add build-base zstd-dev sbcl curl make git linux-headers cargo openssl
3.13 buildah config --workingdir /home/demon $id
3.14 buildah config -l=demo $id
3.15 buildah run --net host $id hg clone https://vc.compiler.company/comp/core
3.16 buildah run --net host $id hg clone https://vc.compiler.company/comp/infra
3.17+buildah run --net host $id sh -c 'cd infra && make rocksdb-install'
3.18 buildah run --net host $id sh -c 'cd infra && make sbcl-install'
3.19-# buildah config --entrypoint
3.20+buildah run --net host $id sh -c 'cd infra && make ts-langs'
3.21+buildah run --net host $id sh -c 'curl -o /tmp/quicklisp.lisp -O https://beta.quicklisp.org/quicklisp.lisp'
3.22+buildah run --net host $id sh -c 'sbcl --load /tmp/quicklisp.lisp --eval (quicklisp-quickstart:install)'
3.23+buildah run --net host $id sh -c 'cd infra && make dist/fasl'
3.24+buildah run --net host $id sh -c 'mv infra/dist/fasl/* /usr/local/lib/sbcl/'
3.25+buildah run --net host $id sh -c './infra/scripts/install-cargo-tools.sh'
3.26+buildah run --net host $id sh -c 'cd infra && make clean'
3.27+buildah config --entrypoint '["sbcl", "--core", "/usr/local/lib/sbcl/prelude.fasl"]' $id
3.28 buildah commit $id ci-worker