diff --git a/CMakeLists.txt b/CMakeLists.txt index f2edb6479937e37f62742999dc33fc36db7c09a6..224269ae423f73a2e276e9f5a9275426b9f1f262 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,7 +25,7 @@ project (lcr) option(VERSION "set lcr version" ON) if (VERSION STREQUAL "ON") - set(LCR_VERSION "2.0.2") + set(LCR_VERSION "2.0.3") endif() option(DEBUG "set lcr gcc option" ON) diff --git a/lcr.spec b/lcr.spec index 93d763456b6530c50b29d79b1f6b339e14e8b11f..c0cd6cfbf4471bb324ad6a99b8d779f0cf29e7ab 100644 --- a/lcr.spec +++ b/lcr.spec @@ -1,5 +1,5 @@ -%global _version 2.0.2 -%global _release 20200803.120020.git8462c29a +%global _version 2.0.3 +%global _release 20200810.102757.git9fc48b6c %global _inner_name isula_libutils Name: lcr diff --git a/release_notes b/release_notes new file mode 100644 index 0000000000000000000000000000000000000000..579a061e14481a456b6d282d84cf73621b12e340 --- /dev/null +++ b/release_notes @@ -0,0 +1,27 @@ +2020-08-10 lifeng release 2.0.3 + - !67 add debug package Merge pull request !67 from YoungJQ/master + - !66 info.json add name field Merge pull request !66 from Zhangxiaoyu/master + - !64 lcr:remove big-data related fields of rootfs.json Merge pull request !64 from Jackey_1024/master + - !65 devmapper: surpport update Merge pull request !65 from gaohuatao/update + - !63 stats info add cache/total cache field Merge pull request !63 from Zhangxiaoyu/master + - !62 image: remove image operator time config Merge pull request !62 from lifeng_isula/master + - !61 Image: merge implement_image branch to master Merge pull request !61 from lifeng_isula/image + - !55 backport libocispec Merge pull request !55 from haozi007/change + - !56 improve ut manager Merge pull request !56 from haozi007/work + - !54 improve gcov of log Merge pull request !54 from haozi007/change + - !53 support fuzz Merge pull request !53 from haozi007/change + - !51 change name of testcases Merge pull request !51 from haozi007/change + - !50 回退 'Pull Request !49 : change name of testcases' Merge pull request !50 from lifeng_isula/revert-merge-49-master + - !49 change name of testcases Merge pull request !49 from haozi007/change + - !48 improve html show Merge pull request !48 from haozi007/change + - !47 log llt invalid target Merge pull request !47 from haozi007/change + - !46 improve llt Merge pull request !46 from haozi007/change + - !45 improve log driver check Merge pull request !45 from haozi007/change + - !44 support calico Merge pull request !44 from haozi007/change + - !42 support import rootfs to be image Merge pull request !42 from wangfengtu/support_import + - !41 fix license Merge pull request !41 from haozi007/change + + dev stats: + - 37 files changed, 1129 insertions(+), 139 deletions(-) + - contributors: haozi007, lifeng68, Zhangxiaoyu, WangFengTu, YoungJQ, gaohuatao, jikui, lifeng_isula, wujing + diff --git a/update-version.bash b/update-version.bash index 76697b8418d6e32058484c15b2e63c60ffd8172d..fb421bee81fc383f73266e90c6072749febda1fb 100755 --- a/update-version.bash +++ b/update-version.bash @@ -25,6 +25,29 @@ # # usage # ./update-version.bash + +function update_release_notes() +{ + LAST_RELEASE=$(git describe --tags --abbrev=0) + # Prepare proposed delease notes + rm -f release_notes.tmp + echo "$(date "+%Y-%m-%d") $USER release $1" >> release_notes.tmp + git log --first-parent --oneline $LAST_RELEASE.. | cut -d' ' -f 2- | sed 's/^/ - /' >> release_notes.tmp + echo >> release_notes.tmp + echo " dev stats:" >> release_notes.tmp + echo " -$(git diff --shortstat $LAST_RELEASE)" >> release_notes.tmp + echo -n " - contributors: " >> release_notes.tmp + git shortlog -ns --no-merges $LAST_RELEASE..HEAD | cut -d$'\t' -f 2 | sed -e ':a' -e 'N' -e '$!ba' -e 's/\n/, /g' >> release_notes.tmp + echo "#" >> release_notes.tmp + echo "#" >> release_notes.tmp + echo "#" >> release_notes.tmp + echo >> release_notes.tmp + cat release_notes >> release_notes.tmp + grep -v '^#' release_notes.tmp | sed '/./,$!d' > release_notes + rm -rf release_notes.tmp +} + + topDir=$(git rev-parse --show-toplevel) specfile="${topDir}/lcr.spec" CMakefile="${topDir}/CMakeLists.txt" @@ -51,6 +74,10 @@ fi new_version=${first_old_version}.${second_old_version}.${third_old_version} +if [[ ${choice} -ne "d" ]]; then + update_release_notes "$new_version" +fi + echo "The version number has been modified: ${old_version} => ${new_version}" old_release=$(cat ${specfile} | grep "%global" | grep "_release" | awk {'print $3'})