Skip to content

Commit

Permalink
Remove nettle from github actions, readme and Dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
kpcyrd committed Nov 12, 2024
1 parent 05f78d6 commit e8bd577
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
restore-keys: ${{ runner.os }}-cargo-release-

- name: Install dependencies (apt)
run: sudo apt-get install libpcsclite-dev nettle-dev
run: sudo apt-get install libpcsclite-dev

- name: Build
run: cargo build --release --verbose
Expand Down Expand Up @@ -104,7 +104,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/download-artifact@v3
- name: Install dependencies (apt)
run: sudo apt-get install libpcsclite-dev nettle-dev
run: sudo apt-get install libpcsclite-dev
- name: Setup environment
run: ${{ matrix.plot.setup }}
if: ${{ matrix.plot.setup }}
Expand All @@ -118,7 +118,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/download-artifact@v3
- name: Install dependencies (apt)
run: sudo apt-get install libpcsclite-dev nettle-dev
run: sudo apt-get install libpcsclite-dev
- name: Setup rust for musl target
run: rustup target add x86_64-unknown-linux-musl
- name: Compile all plots
Expand All @@ -143,7 +143,7 @@ jobs:
restore-keys: ${{ runner.os }}-cargo-debug-

- name: Install dependencies (apt)
run: sudo apt-get install libpcsclite-dev nettle-dev sq
run: sudo apt-get install libpcsclite-dev sq

- name: Run clippy
run: cargo clippy -- -D warnings
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
FROM rust:1-alpine3.20 as build
ENV RUSTFLAGS="-C target-feature=-crt-static"
RUN --mount=type=cache,target=/var/cache/apk ln -vs /var/cache/apk /etc/apk/cache && \
apk add clang-dev musl-dev nettle-dev pcsc-lite-dev openssl-dev shared-mime-info xz-dev zstd-dev && \
apk add clang-dev musl-dev pcsc-lite-dev openssl-dev shared-mime-info xz-dev zstd-dev && \
rm /etc/apk/cache
WORKDIR /app
COPY ./ /app
Expand All @@ -17,7 +17,7 @@ RUN strip sh4d0wup
FROM alpine:3.20 as basic
# install dependencies
RUN --mount=type=cache,target=/var/cache/apk ln -vs /var/cache/apk /etc/apk/cache && \
apk add clang-libs libgcc nettle pcsc-lite-libs openssl shared-mime-info xz zstd-libs && \
apk add clang-libs libgcc pcsc-lite-libs openssl shared-mime-info xz zstd-libs && \
rm /etc/apk/cache

FROM basic as smol
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Have you ever wondered if the update you downloaded is the same one everybody el
There's a pre-built binary in the Arch Linux [extra] repository. To build the binary from source on a Debian based system use this (tested with ubuntu 22.04):

```sh
apt-get install curl git build-essential clang pkg-config libssl-dev libzstd-dev libpcsclite-dev nettle-dev liblzma-dev
apt-get install curl git build-essential clang pkg-config libssl-dev libzstd-dev libpcsclite-dev liblzma-dev
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
source "$HOME/.cargo/env"
git clone https://github.com/kpcyrd/sh4d0wup
Expand Down

0 comments on commit e8bd577

Please sign in to comment.