diff --git a/.github/renovate.json b/.github/renovate.json index 86741260..8e331a7f 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -42,6 +42,21 @@ ], "versioningTemplate": "regex:^(?[\\S]*\\d+\\.\\d+(?:\\.\\d+)?(?:[\\S]*)?-alpine-?)(?\\d+)\\.(?\\d+)(?:\\.(?\\d+))?$", "datasourceTemplate": "docker", + }, + { + "customType": "regex", + "fileMatch": [ + "^Earthfile$" + ], + "matchStringsStrategy": "recursive", + "matchStrings": [ + "FROM\\s*.*?alpine[.:]?(?\\d+)\\.(?\\d+)(?:\\n|.)*", + "apk\\s+add\\s+(?:\\n|.)*?[^\\\\]\\n", + "(?[^\\s=~]+)~?=(?[^\\s=]+)" + ], + "datasourceTemplate": "repology", + "depNameTemplate": "alpine_{{alpineMajor}}_{{alpineMinor}}/{{name}}", + "versioningTemplate": "loose" } ] } diff --git a/Earthfile b/Earthfile index b1debe34..ef491f6e 100644 --- a/Earthfile +++ b/Earthfile @@ -14,11 +14,9 @@ COPY_METADATA: rust-base: FROM rust:1.86.0-alpine3.20@sha256:2ee35275aeaa2e438f34a0563f7931988f5c5254e2eeec562f95a60ca2a2e7c3 - # renovate: datasource=repology depName=alpine_3_20/bash versioning=loose - ENV BASH_VERSION="5.2.26-r0" - # renovate: datasource=repology depName=alpine_3_20/musl-dev versioning=loose - ENV MUSL_VERSION="1.2.5-r1" - RUN apk add --no-cache bash=$BASH_VERSION musl-dev=$MUSL_VERSION + RUN apk add --no-cache \ + bash=5.2.26-r0 \ + musl-dev=1.2.5-r1 RUN rustup component add rustfmt clippy WORKDIR "/monkey_interpreter" @@ -129,9 +127,8 @@ check-rust-linting: check-shell-linting: FROM +rust-base - # renovate: datasource=repology depName=alpine_3_20/shellcheck versioning=loose - ENV SHELLCHECK_VERSION="0.10.0-r1" - RUN apk add --no-cache shellcheck=$SHELLCHECK_VERSION + RUN apk add --no-cache \ + shellcheck=0.10.0-r1 DO +COPY_CI_DATA RUN ./ci/check-shell-linting.sh