Compare commits
11 commits
Author | SHA1 | Date | |
---|---|---|---|
|
6ffa2b739c | ||
870ac63268 | |||
decaab505d | |||
1b5aa6396a | |||
75ceb6061c | |||
d135d5869d | |||
68a78fbaa3 | |||
3daf1c7ccf | |||
18e606baa8 | |||
cdce2e3048 | |||
8b9b16aa2e |
4 changed files with 27 additions and 9 deletions
|
@ -15,6 +15,21 @@ jobs:
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Machete
|
||||||
|
uses: https://git.kemitix.net/kemitix/rust@next
|
||||||
|
with:
|
||||||
|
args: cargo machete
|
||||||
|
|
||||||
|
- name: Format
|
||||||
|
uses: https://git.kemitix.net/kemitix/rust@next
|
||||||
|
with:
|
||||||
|
args: ${{ matrix.toolchain.name }} cargo fmt --check
|
||||||
|
|
||||||
|
- name: Clippy
|
||||||
|
uses: https://git.kemitix.net/kemitix/rust@next
|
||||||
|
with:
|
||||||
|
args: ${{ matrix.toolchain.name }} cargo clippy
|
||||||
|
|
||||||
- name: Test
|
- name: Test
|
||||||
uses: https://git.kemitix.net/kemitix/rust@next
|
uses: https://git.kemitix.net/kemitix/rust@next
|
||||||
with:
|
with:
|
||||||
|
|
12
Dockerfile
12
Dockerfile
|
@ -1,4 +1,4 @@
|
||||||
FROM docker.io/rust:1.81.0-slim-bookworm
|
FROM docker.io/rust:1.82.0-slim-bookworm
|
||||||
|
|
||||||
# nodejs - runtime used by forgejo/github actions
|
# nodejs - runtime used by forgejo/github actions
|
||||||
# curl - to download cargo-binstall
|
# curl - to download cargo-binstall
|
||||||
|
@ -9,7 +9,7 @@ FROM docker.io/rust:1.81.0-slim-bookworm
|
||||||
# git - git
|
# git - git
|
||||||
RUN apt-get update \
|
RUN apt-get update \
|
||||||
&& \
|
&& \
|
||||||
apt-get satisfy -y "nodejs (>=18.19.0), curl (>=7.88.1), pkg-config (>=1.8.1), libssl-dev (>=3.0.14), git (>=2.39.2)" \
|
apt-get satisfy -y "nodejs (>=18.19.0), curl (>=7.88.1), pkg-config (>=1.8.1), libssl-dev (>=3.0.14), git (>=2.39.2), libdbus-1-dev (>= 1.14.10), libtag1-dev (>= 1.13), libtagc0-dev (>= 1.13), xorg-dev (>=7.7), libxcb-shape0-dev (>=0.15), libxcb-xfixes0-dev (>=0.15)" \
|
||||||
&& \
|
&& \
|
||||||
rm -r /var/lib/apt/lists/*
|
rm -r /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
@ -19,10 +19,10 @@ RUN curl -L https://github.com/cargo-bins/cargo-binstall/releases/download/v1.9.
|
||||||
mv cargo-binstall /usr/local/bin/
|
mv cargo-binstall /usr/local/bin/
|
||||||
|
|
||||||
RUN cargo binstall -y \
|
RUN cargo binstall -y \
|
||||||
cargo-chef@0.1.67 \
|
cargo-chef@0.1 \
|
||||||
cargo-hack@0.6.31 \
|
cargo-hack@0.6 \
|
||||||
release-plz@0.3.80 && \
|
cargo-machete@0.6.2 \
|
||||||
rustup component add rustfmt clippy
|
release-plz@0.3
|
||||||
|
|
||||||
COPY entrypoint.sh /
|
COPY entrypoint.sh /
|
||||||
|
|
||||||
|
|
|
@ -12,10 +12,10 @@ jobs:
|
||||||
test:
|
test:
|
||||||
runs-on: docker
|
runs-on: docker
|
||||||
steps:
|
steps:
|
||||||
- uses: https://git.kemitix.net/kemitix/rust@v1.80.0
|
- uses: https://git.kemitix.net/kemitix/rust@v2.3.0
|
||||||
with:
|
with:
|
||||||
args: nightly cargo test
|
args: nightly cargo test
|
||||||
- uses: https://git.kemitix.net/kemitix/rust@v1.80.0
|
- uses: https://git.kemitix.net/kemitix/rust@v2.3.0
|
||||||
with:
|
with:
|
||||||
args: v1.79.0 cargo build
|
args: v1.79.0 cargo build
|
||||||
```
|
```
|
||||||
|
|
|
@ -26,7 +26,10 @@ if [[ "${ARGS[0]}" == v1* ]]; then
|
||||||
fi
|
fi
|
||||||
echo "Selected toolchain: ${TOOLCHAIN}"
|
echo "Selected toolchain: ${TOOLCHAIN}"
|
||||||
|
|
||||||
|
echo ">>> Update toolchain"
|
||||||
rustup update "${TOOLCHAIN}"
|
rustup update "${TOOLCHAIN}"
|
||||||
|
echo ">>> Install rustfmt and clippy"
|
||||||
|
rustup component add --toolchain "${TOOLCHAIN}" rustfmt clippy
|
||||||
|
|
||||||
if test "${ARGS[0]}" == "cargo";then
|
if test "${ARGS[0]}" == "cargo";then
|
||||||
PRE_COMMAND="cargo +${TOOLCHAIN} "
|
PRE_COMMAND="cargo +${TOOLCHAIN} "
|
||||||
|
@ -43,5 +46,5 @@ COMMAND=$(
|
||||||
)
|
)
|
||||||
|
|
||||||
# execute command
|
# execute command
|
||||||
echo "${PRE_COMMAND} ${COMMAND}"
|
echo ">>> ${PRE_COMMAND} ${COMMAND}"
|
||||||
${PRE_COMMAND} ${COMMAND}
|
${PRE_COMMAND} ${COMMAND}
|
||||||
|
|
Loading…
Reference in a new issue