changeset 141: |
ea811337b8a6 |
parent 140: |
6b3bc7791faa |
child 142: |
1453fe56e52a |
author: |
Richard Westhaver <ellis@rwest.io> |
date: |
Sat, 20 Jan 2024 22:56:47 -0500 |
files: |
Containerfile.box Containerfile.operator Containerfile.vc Containerfile.worker makefile scripts/install-nu-pack.sh scripts/install-nushell-pack.sh |
description: |
upgrtades |
1.1--- a/Containerfile.box Sat Jan 20 21:31:46 2024 -0500
1.2+++ b/Containerfile.box Sat Jan 20 22:56:47 2024 -0500
1.3@@ -14,7 +14,7 @@
1.4 RUN make rustup-install
1.5 ENV PATH="$PATH:/usr/local/share/cargo/bin"
1.6 RUN rustup update && rustup default nightly
1.7-RUN sh scripts/install-nu-pack.sh
1.8+RUN sh scripts/install-nushell-pack.sh
1.9 RUN sh scripts/install-emacs-pack.sh
1.10 RUN sh scripts/install-sbcl-pack.sh
1.11 RUN sh scripts/install-rocksdb-pack.sh
1.12@@ -24,4 +24,4 @@
1.13 RUN make core-install
1.14 RUN make clean
1.15 WORKDIR /
1.16-ENTRYPOINT ["/usr/local/bin/nu", "-i", "--config", "/etc/nushell/config.nu", "--env-config", "/etc/nushell/env.nu"]
1.17\ No newline at end of file
1.18+ENTRYPOINT ["/usr/local/bin/nu", "--config", "/etc/nushell/config.nu", "--env-config", "/etc/nushell/env.nu", "-i"]
1.19\ No newline at end of file
2.1--- a/Containerfile.operator Sat Jan 20 21:31:46 2024 -0500
2.2+++ b/Containerfile.operator Sat Jan 20 22:56:47 2024 -0500
2.3@@ -1,9 +1,9 @@
2.4-FROM localhost/ci-worker
2.5+FROM infra/worker
2.6 RUN apk add --no-cache tree-sitter-dev autoconf texinfo libgccjit-dev zlib-dev gnutls-dev sysprof gpg bash json-c-dev ncurses-dev zstd-dev
2.7 WORKDIR /usr/local/src/core
2.8 RUN hg pull -u
2.9+RUN hg clean
2.10 WORKDIR /usr/local/src/infra
2.11 RUN hg pull -u
2.12-RUN make -j4 operator
2.13 RUN make clean
2.14 WORKDIR /
2.15\ No newline at end of file
3.1--- a/Containerfile.vc Sat Jan 20 21:31:46 2024 -0500
3.2+++ b/Containerfile.vc Sat Jan 20 22:56:47 2024 -0500
3.3@@ -1,3 +1,3 @@
3.4-FROM heptapod:latest as vc
3.5+FROM heptapod:latest
3.6 RUN gitlab-ctl upgrade
3.7 COPY etc/gitlab/gitlab.rb /etc/gitlab/gitlab.rb
3.8\ No newline at end of file
4.1--- a/Containerfile.worker Sat Jan 20 21:31:46 2024 -0500
4.2+++ b/Containerfile.worker Sat Jan 20 22:56:47 2024 -0500
4.3@@ -1,4 +1,4 @@
4.4-FROM localhost/alpine
4.5+FROM infra/alpine
4.6 VOLUME /store
4.7 VOLUME /stash
4.8 ADD etc/skel /etc/
5.1--- a/makefile Sat Jan 20 21:31:46 2024 -0500
5.2+++ b/makefile Sat Jan 20 22:56:47 2024 -0500
5.3@@ -81,9 +81,9 @@
5.4 $(NUSHELL_TARGET):scripts/get-nushell.sh;$<
5.5 nushell:$(NUSHELL_TARGET)
5.6 nushell-build:$(NUSHELL_TARGET)
5.7- cd $< && cargo build --release --features default-no-clipboard,extra,dataframe,sqlite,wasi
5.8+ cd $< && cargo build --workspace --release --features dataframe
5.9 nushell-install:nushell-build
5.10- cd $< && cargo install --path .
5.11+ cd $< && ./scripts/install-all.sh
5.12 ### SBCL
5.13 SBCL_TARGET:=build/src/sbcl
5.14 $(SBCL_TARGET):scripts/get-sbcl.sh $(B)
5.15@@ -187,8 +187,11 @@
5.16 mv emacs-*.*.* emacs && \
5.17 tar -I 'zstd' -cf ../../../dist/emacs-binary.tar.zst emacs
5.18
5.19-dist/nu:$(D) nushell-build;zstd $(NUSHELL_TARGET)/target/release/nu -o $</nu.zst
5.20-
5.21+dist/nushell:$(D) nushell-build
5.22+ cd $(NUSHELL_TARGET)/target/release/ && \
5.23+ tar -I 'zstd' -cf ../../../../../$</nushell.tar.zst \
5.24+ nu nu_plugin_custom_values nu_plugin_formats nu_plugin_gstat \
5.25+ nu_plugin_inc nu_plugin_query utils
5.26 dist/tree-sitter:scripts/tree-sitter-install-langs.sh $(D)
5.27 PREFIX=$(D) $<
5.28 # requires quicklisp loaded in .skelrc
6.1--- a/scripts/install-nu-pack.sh Sat Jan 20 21:31:46 2024 -0500
6.2+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
6.3@@ -1,6 +0,0 @@
6.4-#!/bin/sh
6.5-set -e
6.6-cd build/src
6.7-curl -O https://packy.compiler.company/dist/x86_64-unknown-linux-gnu/nu.zst
6.8-unzstd nu.zst
6.9-install -m 755 nu /usr/local/bin/
7.1--- /dev/null Thu Jan 01 00:00:00 1970 +0000
7.2+++ b/scripts/install-nushell-pack.sh Sat Jan 20 22:56:47 2024 -0500
7.3@@ -0,0 +1,10 @@
7.4+#!/bin/sh
7.5+set -e
7.6+cd build/src
7.7+mkdir nushell && cd nushell
7.8+curl -O https://packy.compiler.company/dist/x86_64-unknown-linux-gnu/nushell.tar.zst
7.9+unzstd nushell.tar.zst
7.10+tar -xvf nushell.tar
7.11+rm -rf nushell.tar*
7.12+install -m 755 ./* /usr/local/bin/
7.13+