From ea29d6853b81cfaeb46cfc52ef88bd27037471ed Mon Sep 17 00:00:00 2001 From: Telan <13066272+TheElan@users.noreply.github.com> Date: Sun, 14 Nov 2021 21:23:42 +0200 Subject: [PATCH] build: fix maintenance script replacing too much strings --- .github/scripts/update-version.sh | 2 +- build.gradle | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/scripts/update-version.sh b/.github/scripts/update-version.sh index d4d9c3d..2c862bd 100755 --- a/.github/scripts/update-version.sh +++ b/.github/scripts/update-version.sh @@ -1,6 +1,6 @@ if [ ! -z $(git diff --name-only HEAD HEAD~1 | grep build.gradle) ]; then new_version="$(git log -n1 --format=format:"%H")" - sed --in-place "s!//version:.*!//version: $new_version!g" build.gradle + sed --in-place "s!//^version:.*!//version: $new_version!g" build.gradle git add build.gradle git commit -m "[ci skip] update build script version to $new_version" git push diff --git a/build.gradle b/build.gradle index 608b813..ab33b92 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: b61969b80aa3f0b5eab40e92bf943011395d0114 +//version: b61969b80aa3f0b5eab40e92bf943011395d0114ssssss /* DO NOT CHANGE THIS FILE! @@ -52,10 +52,10 @@ if(JavaVersion.current() != JavaVersion.VERSION_1_8) { throw new GradleException("This project requires Java 8, but it's running on " + JavaVersion.current()) } -String getVersionHash(String buildScriptContent) { - String[] lines = buildScriptContent.split("\n") - if(lines.size() > 0 && lines[0].startsWith("//version: b61969b80aa3f0b5eab40e92bf943011395d0114 - return lines[0].substring(11) +static String getVersionHash(String buildScriptContent) { + String versionLine = buildScriptContent.find("^//version: [a-z0-9]*") + if(versionLine != null) { + return versionLine.split(": ").last() } return "" }