From ea5f43aa7766dc0813b022974769fe704c9a114f Mon Sep 17 00:00:00 2001 From: rmtshnik Date: Fri, 6 Nov 2026 11:33:29 +0300 Subject: [PATCH] fix(engine): use POSIX expansion for Telemt commit check --- .github/workflows/build-engine.yml | 2 +- mtproxymax.sh | 2 +- tests/test_engine_image.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-engine.yml b/.github/workflows/build-engine.yml index 4b66c85..9a5a04d 100644 --- a/.github/workflows/build-engine.yml +++ b/.github/workflows/build-engine.yml @@ -46,7 +46,7 @@ jobs: RUN apt-get update && apt-get install -y --no-install-recommends git && rm -rf /var/lib/apt/lists/* RUN git clone "https://github.com/${TELEMT_REPO}.git" /build WORKDIR /build - RUN git checkout --detach "${TELEMT_COMMIT}" && test "$(git rev-parse HEAD | cut -c1-7)" = "${TELEMT_COMMIT:0:7}" + RUN git checkout --detach "${TELEMT_COMMIT}" && test "$(git rev-parse HEAD | cut -c1-7)" = "$(printf '%.7s' "${TELEMT_COMMIT}")" ENV CARGO_PROFILE_RELEASE_LTO=true CARGO_PROFILE_RELEASE_CODEGEN_UNITS=1 CARGO_PROFILE_RELEASE_DEBUG=false RUN cargo build --release --locked && (strip target/release/telemt 2>/dev/null || true) && cp target/release/telemt /telemt FROM debian:bookworm-slim diff --git a/mtproxymax.sh b/mtproxymax.sh index 46274e2..81134c6 100644 --- a/mtproxymax.sh +++ b/mtproxymax.sh @@ -1189,7 +1189,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends git && \ rm -rf /var/lib/apt/lists/* RUN git clone "https://github.com/telemt/telemt.git" /build WORKDIR /build -RUN git checkout --detach "${TELEMT_COMMIT}" && test "$(git rev-parse HEAD | cut -c1-7)" = "${TELEMT_COMMIT:0:7}" +RUN git checkout --detach "${TELEMT_COMMIT}" && test "$(git rev-parse HEAD | cut -c1-7)" = "$(printf '%.7s' "${TELEMT_COMMIT}")" ENV CARGO_PROFILE_RELEASE_LTO=true CARGO_PROFILE_RELEASE_CODEGEN_UNITS=1 CARGO_PROFILE_RELEASE_DEBUG=false RUN cargo build --release --locked && \ (strip target/release/telemt 2>/dev/null || true) && \ diff --git a/tests/test_engine_image.sh b/tests/test_engine_image.sh index 61fc523..a38ca1f 100644 --- a/tests/test_engine_image.sh +++ b/tests/test_engine_image.sh @@ -53,7 +53,7 @@ build_telemt_image assert_no_latest_pull grep -q "^build --build-arg TELEMT_COMMIT=${TELEMT_COMMIT} " "$tmp/calls" assert_marker "$version" -grep -Fq 'RUN git checkout --detach "${TELEMT_COMMIT}" && test "$(git rev-parse HEAD | cut -c1-7)" = "${TELEMT_COMMIT:0:7}"' "$tmp/Dockerfile" +grep -Fq 'RUN git checkout --detach "${TELEMT_COMMIT}" && test "$(git rev-parse HEAD | cut -c1-7)" = "$(printf '\''%.7s'\'' "${TELEMT_COMMIT}")"' "$tmp/Dockerfile" grep -Fq 'cargo build --release --locked' "$tmp/Dockerfile" reset_case