changeset 46: |
114fd45076cf |
parent 45: |
e627a4f4046a |
child 47: |
276ac5b5d1fa |
author: |
ellis <ellis@rwest.io> |
date: |
Tue, 02 Jan 2024 22:17:10 -0500 |
files: |
etc/skel/.sbclrc makefile virt/build-ci-pod.sh virt/build-ci-worker.sh |
description: |
fix |
1.1--- a/etc/skel/.sbclrc Tue Jan 02 20:17:01 2024 -0500
1.2+++ b/etc/skel/.sbclrc Tue Jan 02 22:17:10 2024 -0500
1.3@@ -1,3 +1,4 @@
1.4+;;; .sbclrc --- sbcl init file -*- mode: common-lisp; -*-
1.5 (in-package :cl-user)
1.6 (setq *debug-beginner-help-p* nil
1.7 *print-case* :downcase
1.8@@ -7,4 +8,6 @@
1.9 #-quicklisp
1.10 (let ((quicklisp-init (merge-pathnames "quicklisp/setup.lisp" (user-homedir-pathname))))
1.11 (when (probe-file quicklisp-init)
1.12- (load quicklisp-init)))
1.13\ No newline at end of file
1.14+ (load quicklisp-init)))
1.15+
1.16+(require :sb-aclrepl)
1.17\ No newline at end of file
2.1--- a/makefile Tue Jan 02 20:17:01 2024 -0500
2.2+++ b/makefile Tue Jan 02 22:17:10 2024 -0500
2.3@@ -60,9 +60,12 @@
2.4 rocksdb:$(ROCKSDB_TARGET)
2.5
2.6 rocksdb-install:$(ROCKSDB_TARGET)
2.7- cd $< && cp -rf $(ROCKSDB_TARGET)/include/* /usr/local/include/ && \
2.8- cp -f $(ROCKSDB_TARGET)/librocksdb.* /usr/local/include/
2.9+ cp -rf $(ROCKSDB_TARGET)/include/* /usr/local/include/
2.10+ cp -f $(ROCKSDB_TARGET)/librocksdb.* /usr/local/lib/
2.11
2.12+# TODO: separate params
2.13+# --without-gencgc \
2.14+# --with-mark-region-gc \
2.15 ### SBCL
2.16 SBCL_TARGET:=build/src/sbcl
2.17 $(SBCL_TARGET):scripts/get-sbcl.sh $(B);
2.18@@ -70,8 +73,6 @@
2.19 cd $(SBCL_TARGET) && \
2.20 echo '"2.4.1+main"' > version.lisp-expr && \
2.21 sh make.sh \
2.22- --without-gencgc \
2.23- --with-mark-region-gc \
2.24 --with-sb-xref-for-internals \
2.25 --with-core-compression \
2.26 --dynamic-space-size=8Gb \
3.1--- a/virt/build-ci-pod.sh Tue Jan 02 20:17:01 2024 -0500
3.2+++ b/virt/build-ci-pod.sh Tue Jan 02 22:17:10 2024 -0500
3.3@@ -1,2 +1,2 @@
3.4 #!/usr/bin/env bash
3.5-podman pod create --name ci --restart=always --infra-name=ci-operator -l=operator
3.6+podman pod create --name ci --restart=always --infra-name=ci-operator -l=operator --publish 6000:6000
4.1--- a/virt/build-ci-worker.sh Tue Jan 02 20:17:01 2024 -0500
4.2+++ b/virt/build-ci-worker.sh Tue Jan 02 22:17:10 2024 -0500
4.3@@ -4,8 +4,8 @@
4.4 # dedicated pod named 'ci'.
4.5
4.6 id=$(buildah from alpine-base)
4.7-buildah add $id etc/skel /etc
4.8-buildah run $id adduser alik -D
4.9+buildah add $id etc/skel /etc/skel
4.10+buildah run $id adduser alik -D -k /etc/skel
4.11 buildah run $id adduser demon -D -k /etc/skel
4.12 buildah run $id apk add build-base zstd-dev sbcl curl make git linux-headers cargo openssl perl
4.13 buildah config --workingdir /home/demon $id
4.14@@ -13,10 +13,10 @@
4.15 buildah run --net host $id hg clone https://vc.compiler.company/comp/infra
4.16 buildah run --net host $id sh -c 'make -C infra rocksdb-install'
4.17 buildah run --net host $id sh -c 'make -C infra sbcl-install'
4.18-buildah run --net host $id sh -c 'make -C infra ts-langs'
4.19+buildah run --net host $id sh -c 'make -C infra ts-langs-install'
4.20 buildah run --net host $id sh -c 'make -C infra dist/lisp/fasl'
4.21 buildah run --net host $id sh -c 'mv infra/dist/lisp/fasl/* /usr/local/lib/sbcl/'
4.22 buildah run --net host $id sh -c './infra/scripts/install-cargo-tools.sh'
4.23-buildah run --net host $id sh -c 'make -C clean'
4.24+buildah run --net host $id sh -c 'make -C infra clean'
4.25 buildah config --entrypoint '["/usr/local/bin/sbcl", "--core", "/usr/local/lib/sbcl/prelude.fasl"]' $id
4.26 buildah commit $id ci-worker