changeset 56: |
74e69c49e525 |
parent 55: |
2e515a33787e |
child 57: |
0e2c38d2f0ec |
author: |
ellis <ellis@rwest.io> |
date: |
Wed, 03 Jan 2024 17:18:57 -0500 |
files: |
etc/skel/.sbclrc scripts/install-cargo-tools.sh scripts/quicklisp-install.sh virt/build-ci-worker.sh |
description: |
upgrade |
1.1--- a/etc/skel/.sbclrc Wed Jan 03 16:40:25 2024 -0500
1.2+++ b/etc/skel/.sbclrc Wed Jan 03 17:18:57 2024 -0500
1.3@@ -1,7 +1,7 @@
1.4 ;;; ~/.sbclrc --- sbcl user init file -*- mode: common-lisp; -*-
1.5 (in-package :cl-user)
1.6 #-quicklisp
1.7-(let ((quicklisp-init (merge-pathnames "quicklisp/setup.lisp" (user-homedir-pathname))))
1.8+(let ((quicklisp-init "/usr/local/share/lisp/quicklisp/setup.lisp"))
1.9 (when (probe-file quicklisp-init)
1.10 (load quicklisp-init)))
1.11
2.1--- a/scripts/install-cargo-tools.sh Wed Jan 03 16:40:25 2024 -0500
2.2+++ b/scripts/install-cargo-tools.sh Wed Jan 03 17:18:57 2024 -0500
2.3@@ -6,6 +6,7 @@
2.4 cargo install bottom --root /usr/local/
2.5 cargo install trunk --root /usr/local/
2.6 cargo install tokio-console --root /usr/local/
2.7+cargo install cross --git https://github.com/cross-rs/cross --root /usr/local/
2.8 # cargo install sqlx-cli
2.9 cargo install wasm-bindgen-cli --root /usr/local/
2.10 cargo install wasm-opt --root /usr/local/
3.1--- a/scripts/quicklisp-install.sh Wed Jan 03 16:40:25 2024 -0500
3.2+++ b/scripts/quicklisp-install.sh Wed Jan 03 17:18:57 2024 -0500
3.3@@ -10,11 +10,10 @@
3.4 else
3.5 QUICKLISP_CLIENT_VERSION="\"$QUICKLISP_CLIENT_VERSION\""
3.6 fi
3.7-
3.8+# installs to /usr/local/share/lisp
3.9 sbcl --non-interactive \
3.10 --load build/quicklisp.lisp \
3.11- --eval "(quicklisp-quickstart:install :dist-version $QUICKLISP_DIST_VERSION :client-version $QUICKLISP_CLIENT_VERSION)" \
3.12- --eval "(when (equalp \"$QUICKLISP_ADD_TO_INIT_FILE\" \"true\") (ql-util:without-prompting (ql:add-to-init-file)))"
3.13+ --eval "(quicklisp-quickstart:install :path \"/usr/local/share/lisp/quicklisp\" :dist-version $QUICKLISP_DIST_VERSION :client-version $QUICKLISP_CLIENT_VERSION)" \
3.14
3.15 mkdir -pv /usr/local/share/lisp
3.16 cp build/quicklisp.lisp /usr/local/share/lisp/
4.1--- a/virt/build-ci-worker.sh Wed Jan 03 16:40:25 2024 -0500
4.2+++ b/virt/build-ci-worker.sh Wed Jan 03 17:18:57 2024 -0500
4.3@@ -5,6 +5,7 @@
4.4
4.5 id=$(buildah from alpine-base)
4.6 buildah add $id etc/skel/ /etc/skel/
4.7+buildah copy $id etc/skel/ /root/
4.8 buildah run $id adduser worker -D
4.9 buildah run $id apk add build-base zstd-dev sbcl curl make git linux-headers cargo openssl perl llvm clang
4.10 buildah run $id mkdir /store
4.11@@ -14,7 +15,6 @@
4.12 buildah config --volume /store $id
4.13 buildah run --net host $id hg clone https://vc.compiler.company/comp/infra
4.14 buildah config --workingdir /infra $id
4.15-buildah config --env QUICKLISP_ADD_TO_INIT_FILE=true
4.16 buildah run --net host $id sh -c 'make worker -j4'
4.17 buildah run --net host $id sh -c 'scripts/install-cargo-tools.sh'
4.18 buildah run --net host $id sh -c 'make clean'