changeset 62: |
e1061716787e |
parent 61: |
f6fc47a1e4e3 |
child 63: |
8567ae279270 |
author: |
ellis <ellis@rwest.io> |
date: |
Wed, 03 Jan 2024 21:05:14 -0500 |
files: |
etc/sbclrc etc/skel/.sbclrc makefile virt/build-ci-worker.sh virt/build-heptapod-runner.sh |
description: |
closing in |
1.1--- a/etc/sbclrc Wed Jan 03 19:16:25 2024 -0500
1.2+++ b/etc/sbclrc Wed Jan 03 21:05:14 2024 -0500
1.3@@ -6,8 +6,7 @@
1.4 ;;; Code:
1.5 (in-package :cl-user)
1.6
1.7-(require :asdf)
1.8-
1.9+#-asdf (require :asdf)
1.10 (setq *debug-beginner-help-p* nil
1.11 *print-case* :downcase
1.12 *print-level* 50
1.13@@ -15,3 +14,10 @@
1.14
1.15 (pushnew #P"/usr/share/lisp/" asdf:*central-registry*)
1.16 (pushnew #P"/usr/local/share/lisp/" asdf:*central-registry*)
1.17+#-quicklisp
1.18+(let ((quicklisp-init #P"/usr/local/share/quicklisp/setup.lisp"))
1.19+ (when (probe-file quicklisp-init)
1.20+ (load quicklisp-init)))
1.21+
1.22+#+quicklisp (pushnew #P"/usr/share/lisp/" ql:*local-project-directories* )
1.23+#+quicklisp (pushnew #P"/usr/local/share/lisp/" ql:*local-project-directories*)
2.1--- a/etc/skel/.sbclrc Wed Jan 03 19:16:25 2024 -0500
2.2+++ b/etc/skel/.sbclrc Wed Jan 03 21:05:14 2024 -0500
2.3@@ -1,9 +1,3 @@
2.4 ;;; ~/.sbclrc --- sbcl user init file -*- mode: common-lisp; -*-
2.5-(in-package :cl-user)
2.6-#-quicklisp
2.7-(let ((quicklisp-init "/usr/local/share/quicklisp/setup.lisp"))
2.8- (when (probe-file quicklisp-init)
2.9- (load quicklisp-init)
2.10- (pushnew (truename "/usr/local/share/lisp/") ql:*local-project-directories*)
2.11- (pushnew (truename "/usr/share/lisp/") ql:*local-project-directories* )))
2.12-(require :sb-aclrepl)
2.13+
2.14+#+aclrepl (require :sb-aclrepl)
3.1--- a/makefile Wed Jan 03 19:16:25 2024 -0500
3.2+++ b/makefile Wed Jan 03 21:05:14 2024 -0500
3.3@@ -20,7 +20,7 @@
3.4 HG_COMMIT:=$(shell hg id -i)
3.5 DESTINATION:=/mnt/y/data/packy
3.6 # requires emacs-build-minimal
3.7-worker:rocksdb-install sbcl-install ts-langs-install quicklisp-install
3.8+worker:rocksdb-install sbcl-install ts-langs-install quicklisp-install dist/lisp/fasl
3.9 # artifacts can deploy to dist/TARGET - need target triple first
3.10 # init:sbcl rust emacs rocksdb comp virt;
3.11 # dist/linux dist/rust dist/bundle
4.1--- a/virt/build-ci-worker.sh Wed Jan 03 19:16:25 2024 -0500
4.2+++ b/virt/build-ci-worker.sh Wed Jan 03 21:05:14 2024 -0500
4.3@@ -5,19 +5,19 @@
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 pkgconf fbgrab
4.10-buildah run $id mkdir /store
4.11-buildah run $id mkdir /stash
4.12+buildah run $id apk add build-base zstd-dev sbcl curl make git linux-headers cargo openssl-dev perl llvm clang pkgconf fbgrab
4.13+buildah config --volume /store $id
4.14+buildah config --volume /stash $id
4.15 buildah run $id mkdir /usr/share/lisp
4.16 buildah run $id mkdir /usr/local/share/lisp
4.17+buildah add $id etc/sbclrc /etc/sbclrc
4.18 buildah config --volume /store $id
4.19 buildah run --net host $id hg clone https://vc.compiler.company/comp/infra
4.20 buildah config --workingdir /infra $id
4.21 buildah run --net host $id sh -c 'make worker -j4'
4.22 buildah run --net host $id sh -c 'scripts/install-cargo-tools.sh'
4.23 buildah run --net host $id sh -c 'make clean'
4.24-buildah add $id etc/sbclrc /etc/sbclrc
4.25+buildah copy $id etc/skel/ /root/
4.26 buildah config --workingdir /stash $id
4.27 buildah commit $id ci-worker
5.1--- a/virt/build-heptapod-runner.sh Wed Jan 03 19:16:25 2024 -0500
5.2+++ b/virt/build-heptapod-runner.sh Wed Jan 03 21:05:14 2024 -0500
5.3@@ -2,4 +2,7 @@
5.4 id=$(buildah from --pull docker.io/octobus/heptapod-runner:latest)
5.5 buildah config --annotation vc $id
5.6 buildah config --author='Richard Westhaver' $id
5.7+buildah config --volume /stash $id
5.8+buildah config --volume /store $id
5.9+buildah run --net host -v /mnt/y/data/private/gitlab-runner/:/etc/gitlab-runner $id gitlab-runner register
5.10 buildah commit $id heptapod-runner