changeset 61: |
f6fc47a1e4e3 |
parent 60: |
325908595770 |
child 62: |
e1061716787e |
author: |
ellis <ellis@rwest.io> |
date: |
Wed, 03 Jan 2024 19:16:25 -0500 |
files: |
etc/skel/.sbclrc scripts/quicklisp-install.sh virt/build-box-base.sh virt/build-ci-worker.sh |
description: |
update |
1.1--- a/etc/skel/.sbclrc Wed Jan 03 18:59:49 2024 -0500
1.2+++ b/etc/skel/.sbclrc Wed Jan 03 19:16:25 2024 -0500
1.3@@ -3,9 +3,7 @@
1.4 #-quicklisp
1.5 (let ((quicklisp-init "/usr/local/share/quicklisp/setup.lisp"))
1.6 (when (probe-file quicklisp-init)
1.7- (load quicklisp-init)))
1.8-
1.9-(pushnew (truename "/usr/local/share/lisp/") ql:*local-project-directories*)
1.10-(pushnew (truename "/usr/share/lisp/") ql:*local-project-directories* )
1.11-
1.12+ (load quicklisp-init)
1.13+ (pushnew (truename "/usr/local/share/lisp/") ql:*local-project-directories*)
1.14+ (pushnew (truename "/usr/share/lisp/") ql:*local-project-directories* )))
1.15 (require :sb-aclrepl)
2.1--- a/scripts/quicklisp-install.sh Wed Jan 03 18:59:49 2024 -0500
2.2+++ b/scripts/quicklisp-install.sh Wed Jan 03 19:16:25 2024 -0500
2.3@@ -13,4 +13,4 @@
2.4 # installs to /usr/local/share/lisp
2.5 sbcl --non-interactive \
2.6 --load build/quicklisp.lisp \
2.7- --eval "(quicklisp-quickstart:install :path \"/usr/local/share/quicklisp\" :dist-version $QUICKLISP_DIST_VERSION :client-version $QUICKLISP_CLIENT_VERSION)" \
2.8+ --eval "(quicklisp-quickstart:install :path \"/usr/local/share/quicklisp\" :dist-version $QUICKLISP_DIST_VERSION :client-version $QUICKLISP_CLIENT_VERSION)"
3.1--- a/virt/build-box-base.sh Wed Jan 03 18:59:49 2024 -0500
3.2+++ b/virt/build-box-base.sh Wed Jan 03 19:16:25 2024 -0500
3.3@@ -3,7 +3,7 @@
3.4 # buildah add $id /mnt/y/lab /var/local/lab
3.5 buildah run $id useradd -ms /bin/bash $USER
3.6 buildah run $id mkdir -p /home/$USER/lab /var/local/data
3.7-buildah run --net host $id pacman -Syu make git base-devel zstd llvm curl --noconfirm
3.8+buildah run --net host $id pacman -Syu make git base-devel zstd llvm curl fbgrab --noconfirm
3.9 buildah config --workingdir /home/$USER $id
3.10 buildah run --net host $id hg clone https://vc.compiler.company/comp/core
3.11 buildah run --net host $id hg clone https://vc.compiler.company/comp/infra
4.1--- a/virt/build-ci-worker.sh Wed Jan 03 18:59:49 2024 -0500
4.2+++ b/virt/build-ci-worker.sh Wed Jan 03 19:16:25 2024 -0500
4.3@@ -7,7 +7,7 @@
4.4 buildah add $id etc/skel/ /etc/skel/
4.5 buildah copy $id etc/skel/ /root/
4.6 buildah run $id adduser worker -D
4.7-buildah run $id apk add build-base zstd-dev sbcl curl make git linux-headers cargo openssl perl llvm clang pkg-config
4.8+buildah run $id apk add build-base zstd-dev sbcl curl make git linux-headers cargo openssl perl llvm clang pkgconf fbgrab
4.9 buildah run $id mkdir /store
4.10 buildah run $id mkdir /stash
4.11 buildah run $id mkdir /usr/share/lisp
4.12@@ -18,6 +18,6 @@
4.13 buildah run --net host $id sh -c 'make worker -j4'
4.14 buildah run --net host $id sh -c 'scripts/install-cargo-tools.sh'
4.15 buildah run --net host $id sh -c 'make clean'
4.16-buildah add $id etc/sbclrc /etc/sbclrc # add this AFTER building sbcl
4.17+buildah add $id etc/sbclrc /etc/sbclrc
4.18 buildah config --workingdir /stash $id
4.19 buildah commit $id ci-worker