From dc98b0aac240d77066f2cdc966bb3e775713fde2 Mon Sep 17 00:00:00 2001 From: DCCooper <1866858@gmail.com> Date: Fri, 11 Dec 2020 14:46:37 +0800 Subject: [PATCH] hack:modify gen-version script and add changelog automatically Signed-off-by: DCCooper <1866858@gmail.com> --- VERSION-openeuler | 2 +- gen-version.sh | 7 +++++++ git-commit | 2 +- isula-build.spec | 10 ++++++++-- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/VERSION-openeuler b/VERSION-openeuler index f117806..9d6379c 100644 --- a/VERSION-openeuler +++ b/VERSION-openeuler @@ -1 +1 @@ -0.9.4-13 +0.9.4-14 diff --git a/gen-version.sh b/gen-version.sh index 24fe2e1..9ec6d3e 100755 --- a/gen-version.sh +++ b/gen-version.sh @@ -66,16 +66,23 @@ case ${input} in ;; esac +author=$(git config user.name) +email=$(git config user.email) # VERSION format: # Major.Minor.Revision new_version=${major_old_version}.${minor_old_version}.${revision_old_version} new_release="${new_release_num}" new_all=${new_version}-${new_release_num} +new_changelog=$(cat << EOF +* $(date '+%a %b %d %Y') $author <$email> - $new_all\n- Type:\n- CVE:\n- SUG:\n- DESC:\n +EOF +) # Replace version and release for spec and VERSION files sed -i -e "s/^Version: .*$/Version: ${new_version}/g" "${spec_file}" sed -i -e "s/^Release: .*$/Release: ${new_release}/g" "${spec_file}" +sed -i -e "/\%changelog/a$new_changelog" "${spec_file}" echo "${new_all}" > "${version_file}" if [[ "${old_all}" != "${new_all}" ]]; then diff --git a/git-commit b/git-commit index f8789e8..5ec0782 100644 --- a/git-commit +++ b/git-commit @@ -1 +1 @@ -a7020e9811168d5cebb809294adb6445ba134753 +5304a15d147e95e6add30b8871eb40f457399ec1 diff --git a/isula-build.spec b/isula-build.spec index 63bdedc..0a182b0 100644 --- a/isula-build.spec +++ b/isula-build.spec @@ -2,7 +2,7 @@ Name: isula-build Version: 0.9.4 -Release: 13 +Release: 14 Summary: A tool to build container images License: Mulan PSL V2 URL: https://gitee.com/openeuler/isula-build @@ -85,7 +85,13 @@ fi /usr/share/bash-completion/completions/isula-build %changelog -* Fri Dec 11 2020 lujingxiao - 0.9.4-12 +* Fri Dec 11 2020 lixiang - 0.9.4-14 +- Type:enhancement +- CVE:NA +- SUG:restart +- DESC:Modify gen-version script and add changelog automatically + +* Fri Dec 11 2020 lujingxiao - 0.9.4-13 - Change default umask of isula-builder process * Tue Dec 08 2020 caihaomin - 0.9.4-12