Merge branch 'release/2024.1.1'

shiguredo · Sep 10, 2024 · 6be952a · 6be952a
2 parents 95420fc + d8e6902
commit 6be952a
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -11,6 +11,13 @@
 
 ## develop
 
+## 2024.1.1
+
+**リリース日**: 2024-09-10
+
+- [FIX] test のバージョンを上げる
+  - @torikizi
+
 ## 2024.1.0
 
 **リリース日**: 2024-09-09

diff --git a/VERSION b/VERSION
@@ -1,4 +1,4 @@
-HISUI_VERSION=2024.1.0
+HISUI_VERSION=2024.1.1
 
 BOOST_VERSION=1.83.0
 CLI11_VERSION=2.3.2

diff --git a/doc/USE.md b/doc/USE.md
@@ -13,7 +13,7 @@ Hisui は docker image を用意しています。これを使うことで気軽
 - https://hub.docker.com/r/shiguredo/hisui
 
 ```
-docker run -v /home/shiguredo/sora/archive:/hisui -it shiguredo/hisui:2023.2.1-ubuntu-22.04 -f /hisui/CSX77QY9F57V5BT72S62C28VS4/report-CSX77QY9F57V5BT72S62C28VS4.json
+docker run -v /home/shiguredo/sora/archive:/hisui -it shiguredo/hisui:2024.1.1-ubuntu-22.04 -f /hisui/CSX77QY9F57V5BT72S62C28VS4/report-CSX77QY9F57V5BT72S62C28VS4.json
 ```
 
 - -v で Sora の録画データがある archive フォルダを指定して下さい
@@ -23,7 +23,7 @@ docker run -v /home/shiguredo/sora/archive:/hisui -it shiguredo/hisui:2023.2.1-u
 ## docker 経由で help を見る
 
 ```
-$ docker run -it shiguredo/hisui:2023.2.1-ubuntu-22.04 --help
+$ docker run -it shiguredo/hisui:2024.1.1-ubuntu-22.04 --help
 hisui
 Usage: /usr/local/bin/hisui [OPTIONS]
 

diff --git a/src/version/version.cpp b/src/version/version.cpp
@@ -60,7 +60,7 @@ std::string get_fdkaac_aacenc_version() {
 #endif
 
 std::string get_hisui_version() {
-  return "2023.2.1";
+  return "2024.1.1";
 }
 
 std::string get_cppmp4_version() {

diff --git a/test/version/version_test.cpp b/test/version/version_test.cpp
@@ -5,7 +5,7 @@
 BOOST_AUTO_TEST_SUITE(version)
 
 BOOST_AUTO_TEST_CASE(get_hisui_version) {
-  BOOST_REQUIRE_EQUAL("2023.2.1", hisui::version::get_hisui_version());
+  BOOST_REQUIRE_EQUAL("2024.1.1", hisui::version::get_hisui_version());
 }
 
 BOOST_AUTO_TEST_SUITE_END()