Merge pull request #1 from 19317362/master

merge from 2.9.7
xmake-io · Dec 20, 2024 · 75c7054 · 75c7054
2 parents 11a26d2 + 1b6a5d2
commit 75c7054
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## master (unreleased)
 
+## v2.9.7
+
 ### New features
 
 * [#5813](https://github.com/xmake-io/xmake/pull/5813): Add `before_config` and `after_config` for rule
@@ -1918,6 +1920,8 @@
 
 ## master (开发中)
 
+## v2.9.7
+
 ### 新特性
 
 * [#5813](https://github.com/xmake-io/xmake/pull/5813): 为 rule 添加 `before_config` 和 `after_config`

diff --git a/core/xmake.lua b/core/xmake.lua
@@ -2,7 +2,7 @@
 set_project("xmake")
 
 -- version
-set_version("2.9.6", {build = "%Y%m%d"})
+set_version("2.9.7", {build = "%Y%m%d"})
 
 -- set xmake min version
 set_xmakever("2.8.5")

diff --git a/core/xmake.sh b/core/xmake.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 set_project "xmake"
-set_version "2.9.6" "%Y%m%d"
+set_version "2.9.7" "%Y%m%d"
 
 # set warning all
 set_warnings "all"

diff --git a/scripts/get.ps1 b/scripts/get.ps1
@@ -11,7 +11,7 @@ param (
 )
 
 & {
-    $LastRelease = "v2.9.6"
+    $LastRelease = "v2.9.7"
     $ErrorActionPreference = 'Stop'
 
     function writeErrorTip($msg) {

diff --git a/scripts/rpmbuild/xmake.spec b/scripts/rpmbuild/xmake.spec
@@ -2,7 +2,7 @@
 %define     use_luajit 0
 
 Name:       xmake
-Version:    2.9.6
+Version:    2.9.7
 Release:    1%{?dist}
 Summary:    A cross-platform build utility based on Lua