Skip to content

Commit 879f6b1

Browse files
build: removing unneeded Rust/Cargo installation (#31)
1 parent 0766748 commit 879f6b1

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

Earthfile

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,8 @@ alpine-base:
2020
WORKDIR "/nasm-x86-shellcode-generator"
2121

2222

23-
rust-base:
24-
FROM +alpine-base
25-
# renovate: datasource=repology depName=alpine_3_20/rust versioning=loose
26-
ENV RUST_VERSION="1.78.0-r0"
27-
RUN apk add --no-cache cargo=$RUST_VERSION
28-
29-
3023
check-clean-git-history:
31-
FROM +rust-base
24+
FROM +alpine-base
3225
# renovate: datasource=github-releases depName=DeveloperC286/clean_git_history
3326
ENV CLEAN_GIT_HISTORY_VERSION="v0.2.0"
3427
RUN wget -O - "https://github.com/DeveloperC286/clean_git_history/releases/download/${CLEAN_GIT_HISTORY_VERSION}/x86_64-unknown-linux-musl.gz" | gzip -d > /usr/bin/clean_git_history && chmod 755 /usr/bin/clean_git_history
@@ -38,7 +31,7 @@ check-clean-git-history:
3831

3932

4033
check-conventional-commits-linting:
41-
FROM +rust-base
34+
FROM +alpine-base
4235
# renovate: datasource=github-releases depName=DeveloperC286/conventional_commits_linter
4336
ENV CONVENTIONAL_COMMITS_LINTER_VERSION="v0.13.0"
4437
RUN wget -O - "https://github.com/DeveloperC286/conventional_commits_linter/releases/download/${CONVENTIONAL_COMMITS_LINTER_VERSION}/x86_64-unknown-linux-musl.gz" | gzip -d > /usr/bin/conventional_commits_linter && chmod 755 /usr/bin/conventional_commits_linter
@@ -88,6 +81,11 @@ COPY_SOURCECODE:
8881

8982

9083
compile:
91-
FROM +rust-base
84+
FROM +alpine-base
85+
# renovate: datasource=repology depName=alpine_3_20/gcc versioning=loose
86+
ENV GCC_VERSION="13.2.1_git20240309-r0"
87+
# renovate: datasource=repology depName=alpine_3_20/musl-dev versioning=loose
88+
ENV MUSL_VERSION="1.2.5-r0"
89+
RUN apk add --no-cache gcc=$GCC_VERSION musl-dev=$MUSL_VERSION
9290
DO +COPY_SOURCECODE
9391
RUN ./ci/compile.sh

0 commit comments

Comments
 (0)