Compare commits

..

3 commits

Author SHA1 Message Date
dbe6a60417 feat: allow selecting the nightly toolchain
All checks were successful
/ test (push) Successful in 5s
2024-09-16 17:09:17 +01:00
e931692d33 feat!: drop clang and mold
All checks were successful
/ test (push) Successful in 4s
2024-09-16 16:20:38 +01:00
41d2bb484e docs: update README to current syntax
All checks were successful
/ test (push) Successful in 5s
2024-09-16 16:18:24 +01:00
3 changed files with 55 additions and 18 deletions

View file

@ -13,8 +13,6 @@ RUN apt-get update \
--no-install-recommends \ --no-install-recommends \
nodejs=18.19.0+dfsg-6~deb12u2 \ nodejs=18.19.0+dfsg-6~deb12u2 \
curl=7.88.1-10+deb12u7 \ curl=7.88.1-10+deb12u7 \
clang-16=1:16.0.6-15~deb12u1 \
mold=1.10.1+dfsg-1 \
pkg-config=1.8.1-1 \ pkg-config=1.8.1-1 \
libssl-dev=3.0.14-1~deb12u2 \ libssl-dev=3.0.14-1~deb12u2 \
libdbus-1-dev=1.14.10-1~deb12u1 \ libdbus-1-dev=1.14.10-1~deb12u1 \

View file

@ -14,32 +14,30 @@ jobs:
steps: steps:
- uses: https://git.kemitix.net/kemitix/rust@v1.80.0 - uses: https://git.kemitix.net/kemitix/rust@v1.80.0
with: with:
args: test args: nightly cargo test
- uses: https://git.kemitix.net/kemitix/rust@v1.80.0 - uses: https://git.kemitix.net/kemitix/rust@v1.80.0
with: with:
args: build args: v1.79.0 cargo build
``` ```
The `args` is one of the following:
- <COMMAND>
- [ [nightly | stable | v1.xx.x] ] <COMMAND>
`COMMAND` is the command you want to run. The optional prefix is the Rust toolchain, or version. Allowed values are `nightly`, `stable` or a Rust version.
Where the optional prefix is not given, the `stable` toolchain will be used.
## Contents ## Contents
- nodejs - nodejs
- clang-16
- mold
- rust - rust
- git - git
- cargo - cargo
- cargo-binstall - cargo-binstall
## Linking
To take advantage of the clang and mold packages, add the following to the `.cargo/config.toml` file in your project.
```toml
[target.x86_64-unknown-linux-gnu]
linker = "/usr/bin/clang-16"
rustflags = ["-C", "link-arg=--ld-path=/usr/bin/mold"]
```
## Binary size ## Binary size
To reduce the size of the debug binary, add the following to the `.cargo/config.toml` file in you project. To reduce the size of the debug binary, add the following to the `.cargo/config.toml` file in you project.

View file

@ -2,5 +2,46 @@
set -e set -e
rustup update echo "INPUT_ARGS: ${INPUT_ARGS}"
${INPUT_ARGS}
# split input into an array
read -ra ARGS <<<"${INPUT_ARGS}"
# default toolchain
TOOLCHAIN="stable"
echo "Default toolchain: ${TOOLCHAIN}"
# if first parameter is 'nightly'...
if test "${ARGS[0]}" == "nightly"; then
TOOLCHAIN="nightly"
ARGS=("${ARGS[@]:1}")
fi
if test "${ARGS[0]}" == "stable"; then
TOOLCHAIN="stable" # redundant as this is the default
ARGS=("${ARGS[@]:1}")
fi
if [[ "${ARGS[0]}" == v1* ]]; then
TOOLCHAIN="${ARGS[0]:1}"
ARGS=("${ARGS[@]:1}")
fi
echo "Selected toolchain: ${TOOLCHAIN}"
rustup update "${TOOLCHAIN}"
if test "${ARGS[0]}" == "cargo";then
PRE_COMMAND="cargo +${TOOLCHAIN} "
else
PRE_COMMAND="${ARGS[0]}"
fi
ARGS=("${ARGS[@]:1}")
# ensure toolchain is up-to-date
# recombine remaining arguments
COMMAND=$(
IFS=" "
echo "${ARGS[*]}"
)
# execute command
echo "${PRE_COMMAND} ${COMMAND}"
${PRE_COMMAND} ${COMMAND}