changelog shortlog graph tags branches files raw help

Mercurial > infra / changeset: get-sk fix

changeset 236: 7f1d2001df1d
parent 235: 302be3c3cd94
child 237: c1b5c4d68e2b
author: Richard Westhaver <ellis@rwest.io>
date: Mon, 27 May 2024 04:15:48 +0000
files: containers/Containerfile.box containers/Containerfile.worker scripts/get-sk.sh
description: get-sk fix
     1.1--- a/containers/Containerfile.box	Mon May 27 03:52:06 2024 +0000
     1.2+++ b/containers/Containerfile.box	Mon May 27 04:15:48 2024 +0000
     1.3@@ -15,9 +15,8 @@
     1.4 ENV CARGO_HOME="/usr/local/share/cargo"
     1.5 ENV RUSTUP_HOME="/usr/local/share/rustup"
     1.6 # stage1
     1.7-RUN mkdir .stash
     1.8-RUN sh scripts/get-sk.sh
     1.9-RUN .stash/sk make rustup
    1.10+RUN sh scripts/get-sk.sh /usr/local/bin
    1.11+RUN sk make rustup
    1.12 ENV PATH="$PATH:/usr/local/share/cargo/bin"
    1.13 RUN rustup update
    1.14 # dev rustc components
    1.15@@ -28,15 +27,15 @@
    1.16 # RUN sh scripts/install-sbcl-pack.sh
    1.17 # RUN sh scripts/install-rocksdb-pack.sh
    1.18 # RUN sh scripts/install-cargo-tools.sh
    1.19-RUN .stash/sk make sbcl
    1.20-RUN .stash/sk make quicklisp
    1.21-RUN .stash/sk make sbcl-install
    1.22-RUN .stash/sk make tree-sitter
    1.23-RUN .stash/sk make tree-sitter-langs
    1.24-RUN .stash/sk make emacs-mini
    1.25-RUN .stash/sk make emacs-install
    1.26-RUN .stash/sk make rocksdb
    1.27-RUN .stash/sk make rocksdb-install
    1.28+RUN sk make sbcl
    1.29+RUN sk make quicklisp
    1.30+RUN sk make sbcl-install
    1.31+RUN sk make tree-sitter
    1.32+RUN sk make tree-sitter-langs
    1.33+RUN sk make emacs-mini
    1.34+RUN sk make emacs-install
    1.35+RUN sk make rocksdb
    1.36+RUN sk make rocksdb-install
    1.37 #ADD etc/sbclrc /etc/sbclrc
    1.38 #COPY etc/skel/ /etc/skel/
    1.39 #ADD etc/shells /etc/
     2.1--- a/containers/Containerfile.worker	Mon May 27 03:52:06 2024 +0000
     2.2+++ b/containers/Containerfile.worker	Mon May 27 04:15:48 2024 +0000
     2.3@@ -9,12 +9,14 @@
     2.4 RUN mkdir /usr/share/lisp
     2.5 RUN mkdir /usr/local/share/lisp
     2.6 WORKDIR /usr/local/src
     2.7+RUN hg clone https://vc.compiler.company/comp/infra
     2.8 WORKDIR infra
     2.9-RUN mkdir .stash
    2.10+RUN mkdir -pv .stash
    2.11 RUN sh scripts/get-sk.sh
    2.12 ENV CARGO_HOME="/usr/local/share/cargo"
    2.13 ENV RUSTUP_HOME="/usr/local/share/rustup"
    2.14-RUN .stash/sk make rustup tree-sitter-langs
    2.15+RUN exec .stash/sk make rustup
    2.16+RUN exec .stash/sk make tree-sitter-langs
    2.17 ENV PATH="$PATH:/usr/local/share/cargo/bin"
    2.18 RUN rustup update 
    2.19 RUN rustup default nightly
     3.1--- a/scripts/get-sk.sh	Mon May 27 03:52:06 2024 +0000
     3.2+++ b/scripts/get-sk.sh	Mon May 27 04:15:48 2024 +0000
     3.3@@ -1,5 +1,6 @@
     3.4 #!/bin/sh
     3.5 set -e
     3.6-cd .stash
     3.7-curl -O https://packy.compiler.company/dist/x86_64-unknown-linux-gnu/bin/sk
     3.8-chmod +x sk
     3.9+OUT="${1:-.stash}"
    3.10+mkdir -pv $OUT
    3.11+cd $OUT && curl -O https://packy.compiler.company/dist/x86_64-unknown-linux-gnu/bin/sk && chmod +x sk
    3.12+