changeset 124: |
b0764da27ea1 |
parent 123: |
0c6ceb1c1f9a |
child 125: |
b1c5858d0b0a |
author: |
Richard Westhaver <ellis@rwest.io> |
date: |
Wed, 17 Jan 2024 16:55:21 -0500 |
files: |
Containerfile.box Containerfile.ci-worker makefile scripts/install-emacs-pack.sh scripts/install-rocksdb-pack.sh |
description: |
emacs-pack |
1.1--- a/Containerfile.box Tue Jan 16 22:45:46 2024 -0500
1.2+++ b/Containerfile.box Wed Jan 17 16:55:21 2024 -0500
1.3@@ -13,6 +13,7 @@
1.4 WORKDIR infra
1.5 RUN make build
1.6 RUN make rustup-install
1.7+RUN sh scripts/install-emacs-pack.sh
1.8 RUN sh scripts/install-sbcl-pack.sh
1.9 RUN sh scripts/install-rocksdb-pack.sh
1.10 RUN make quicklisp-install
1.11@@ -21,4 +22,4 @@
1.12 RUN make core-install
1.13 RUN make clean
1.14 EXPOSE 8080
1.15-WORKDIR /
1.16+WORKDIR /
1.17\ No newline at end of file
2.1--- a/Containerfile.ci-worker Tue Jan 16 22:45:46 2024 -0500
2.2+++ b/Containerfile.ci-worker Wed Jan 17 16:55:21 2024 -0500
2.3@@ -3,7 +3,7 @@
2.4 VOLUME /stash
2.5 COPY etc/skel /etc/
2.6 RUN adduser -D worker
2.7-RUN apk add build-base zstd-dev sbcl curl make git linux-headers cargo openssl-dev perl llvm pkgconf clang m4
2.8+RUN apk add build-base zstd-dev sbcl curl make git linux-headers cargo openssl-dev perl llvm pkgconf clang m4 tree-sitter
2.9 RUN mkdir /usr/share/lisp
2.10 RUN mkdir /usr/local/share/lisp
2.11 WORKDIR /usr/local/src
3.1--- a/makefile Tue Jan 16 22:45:46 2024 -0500
3.2+++ b/makefile Wed Jan 17 16:55:21 2024 -0500
3.3@@ -178,6 +178,9 @@
3.4 $< "$(CODE_TARGET)/core/rust/app/cli/mailman" "dist/rust"
3.5
3.6 dist/emacs:emacs-build $(D);
3.7+ cd $(EMACS_TARGET) && ./make-dist --no-info --no-changelog && \
3.8+ mv emacs-*.*.* emacs && \
3.9+ tar -I 'zstd' -cf ../../../dist/emacs-binary.tar.zst emacs
3.10
3.11 dist/tree-sitter:scripts/tree-sitter-install-langs.sh $(D)
3.12 PREFIX=$(D) $<
4.1--- /dev/null Thu Jan 01 00:00:00 1970 +0000
4.2+++ b/scripts/install-emacs-pack.sh Wed Jan 17 16:55:21 2024 -0500
4.3@@ -0,0 +1,8 @@
4.4+#!/bin/sh
4.5+set -e
4.6+cd build/src
4.7+curl -O https://packy.compiler.company/dist/x86_64-unknown-linux-gnu/emacs-binary.tar.zst
4.8+unzstd emacs-binary.tar.zst
4.9+tar -xvf emacs-binary.tar
4.10+cd emacs
4.11+make install
5.1--- a/scripts/install-rocksdb-pack.sh Tue Jan 16 22:45:46 2024 -0500
5.2+++ b/scripts/install-rocksdb-pack.sh Wed Jan 17 16:55:21 2024 -0500
5.3@@ -1,4 +1,6 @@
5.4 #!/bin/sh
5.5+# the rocksdb pack only includes the shared library and headers. the
5.6+# static library is shipped separately.
5.7 set -e
5.8 cd build/src
5.9 curl -O https://packy.compiler.company/dist/x86_64-unknown-linux-gnu/rocksdb-binary.tar.zst