feat: add cargo machete to image

fix: fix typo in Dockerfile
feat: add libdbus-1-dev >=1.14.10 to image
2024-09-17 15:03:34 +01:00 · 2024-09-17 11:39:10 +01:00 · 2024-09-17 11:32:20 +01:00 · 2024-09-17 11:09:03 +01:00 · 2024-09-17 10:54:37 +01:00
3 changed files with 21 additions and 3 deletions
--- a/.forgejo/workflows/test.yml
+++ b/.forgejo/workflows/test.yml
@ -15,6 +15,21 @@ jobs:
    steps:
      - 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
        uses: https://git.kemitix.net/kemitix/rust@next
        with:
--- a/3
+++ b/3
@ -9,7 +9,7 @@ FROM docker.io/rust:1.81.0-slim-bookworm
 # git - git
 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)" \
  && \
  rm -r /var/lib/apt/lists/*

@ -21,6 +21,7 @@ RUN curl -L https://github.com/cargo-bins/cargo-binstall/releases/download/v1.9.
 RUN cargo binstall -y \
  cargo-chef@0.1 \
  cargo-hack@0.6 \
+  cargo-machete@0.6.2 \
  release-plz@0.3

 COPY entrypoint.sh /
--- a/entrypoint.sh
+++ b/entrypoint.sh
@ -26,8 +26,10 @@ if [[ "${ARGS[0]}" == v1* ]]; then
 fi
 echo "Selected toolchain: ${TOOLCHAIN}"

+echo ">>> Update toolchain"
 rustup update "${TOOLCHAIN}"
-rustup component add rustfmt clippy
+echo ">>> Install rustfmt and clippy"
+rustup component add --toolchain "${TOOLCHAIN}" rustfmt clippy

 if test "${ARGS[0]}" == "cargo";then
  PRE_COMMAND="cargo +${TOOLCHAIN} "
@ -44,5 +46,5 @@ COMMAND=$(
 )

 # execute command
-echo "${PRE_COMMAND} ${COMMAND}"
+echo ">>> ${PRE_COMMAND} ${COMMAND}"
 ${PRE_COMMAND} ${COMMAND}
Author	SHA1	Message	Date
Paul Campbell	75ceb6061c	feat: add cargo machete to image All checks were successful / test (map[name:nightly]) (push) Successful in 2m42s Details / test (map[name:v1.81.0]) (push) Successful in 40s Details / test (map[name:stable]) (push) Successful in 4m16s Details	2024-09-17 15:03:34 +01:00
Paul Campbell	d135d5869d	fix: fix typo in Dockerfile All checks were successful / test (map[name:v1.81.0]) (push) Successful in 12s Details / test (map[name:stable]) (push) Successful in 58s Details / test (map[name:nightly]) (push) Successful in 1m47s Details	2024-09-17 11:39:10 +01:00
Paul Campbell	68a78fbaa3	feat: add libdbus-1-dev >=1.14.10 to image All checks were successful / test (map[name:stable]) (push) Successful in 1m7s Details / test (map[name:v1.81.0]) (push) Successful in 12s Details / test (map[name:nightly]) (push) Successful in 1m51s Details	2024-09-17 11:32:20 +01:00
Paul Campbell	3daf1c7ccf	test: test the cargo fmt and clippy work All checks were successful / test (map[name:stable]) (push) Successful in 2m15s Details / test (map[name:v1.81.0]) (push) Successful in 12s Details / test (map[name:nightly]) (push) Successful in 2m48s Details	2024-09-17 11:09:03 +01:00
Paul Campbell	18e606baa8	fix: install rustfmt and clippy into correct toolchains All checks were successful / test (map[name:stable]) (push) Successful in 40s Details / test (map[name:v1.81.0]) (push) Successful in 9s Details / test (map[name:nightly]) (push) Successful in 34s Details	2024-09-17 10:54:37 +01:00