Merge branch 'release/2023.2.1'

.github/workflows/build.yml

@@ -126,6 +126,12 @@ jobs:
           name: ${{ matrix.os }}-hisui-binary-${{ steps.vars.outputs.sha_short }}
           path: release/${{ matrix.os }}/hisui
           if-no-files-found: error
+      - name: Upload Lyra model_coeffs with hash
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ matrix.os }}-lyra-model-coeffs
+          path: third_party/lyra/lyra/lyra/model_coeffs
+          if-no-files-found: error
       - name: Upload tarball
         uses: actions/upload-artifact@v3
         with:
@@ -185,6 +191,22 @@ jobs:
           chmod 755 release/ubuntu-20.04_arm64/hisui
           chmod 755 release/ubuntu-22.04_x86_64/hisui
           chmod 755 release/ubuntu-22.04_arm64/hisui
+      - uses: actions/download-artifact@v3
+        with:
+          name: ubuntu-20.04_x86_64-lyra-model-coeffs
+          path: release/ubuntu-20.04_x86_64/lyra/model_coeffs
+      - uses: actions/download-artifact@v3
+        with:
+          name: ubuntu-20.04_arm64-lyra-model-coeffs
+          path: release/ubuntu-20.04_arm64/lyra/model_coeffs
+      - uses: actions/download-artifact@v3
+        with:
+          name: ubuntu-22.04_x86_64-lyra-model-coeffs
+          path: release/ubuntu-22.04_x86_64/lyra/model_coeffs
+      - uses: actions/download-artifact@v3
+        with:
+          name: ubuntu-22.04_arm64-lyra-model-coeffs
+          path: release/ubuntu-22.04_arm64/lyra/model_coeffs
       - name: Get Versions
         shell: bash
         id: versions

CHANGES.md

@@ -11,6 +11,11 @@
 
 ## develop
 
+## 2023.2.1
+
+- [FIX] docker image 生成を修正する
+    - @haruymaa
+
 ## 2023.2.0
 
 - [UPDATE] 依存ライブラリの更新をする

VERSION

@@ -1,4 +1,4 @@
-HISUI_VERSION=2023.2.0
+HISUI_VERSION=2023.2.1
 
 BOOST_VERSION=1.83.0
 CLI11_VERSION=2.3.2

build.bash

@@ -287,7 +287,9 @@ cmake --build .
 if [ $FLAG_PACKAGE -eq 1 ]; then 
     rm -rf "hisui-${HISUI_VERSION}"
     mkdir "hisui-${HISUI_VERSION}"
+    mkdir "hisui-${HISUI_VERSION}/lyra"
     cp hisui ../../LICENSE ../../NOTICE.md "hisui-${HISUI_VERSION}"
+    cp -r ../../third_party/lyra/lyra/lyra/model_coeffs "hisui-${HISUI_VERSION}/lyra"
     tar cvf "hisui-${HISUI_VERSION}_$PACKAGE.tar.gz" "hisui-${HISUI_VERSION}"
     rm -rf "hisui-${HISUI_VERSION}"
 fi

doc/USE.md

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

docker/Dockerfile

@@ -13,7 +13,8 @@ ARG UBUNTU_VERSION
 ARG TARGETARCH
 COPY release/ubuntu-${UBUNTU_VERSION}_x86_64/hisui /tmp/hisui-amd64
 COPY release/ubuntu-${UBUNTU_VERSION}_arm64/hisui /tmp/hisui-arm64
-COPY third_party/lyra/lyra/lyra/model_coeffs /usr/local/lib/lyra/model_coeffs
-RUN cp /tmp/hisui-$TARGETARCH /usr/local/bin/hisui
+COPY release/ubuntu-${UBUNTU_VERSION}_x86_64/lyra/model_coeffs /tmp/amd64/lyra/model_coeffs
+COPY release/ubuntu-${UBUNTU_VERSION}_arm64/lyra/model_coeffs /tmp/arm64/lyra/model_coeffs
+RUN cp /tmp/hisui-${TARGETARCH} /usr/local/bin/hisui && mkdir -p /usr/local/lib && cp -r /tmp/${TARGETARCH}/lyra /usr/local/lib
 
 ENTRYPOINT ["/usr/bin/tini", "--", "/usr/local/bin/hisui"]

docker/Dockerfile.local

@@ -0,0 +1,19 @@
+ARG UBUNTU_VERSION
+FROM ubuntu:$UBUNTU_VERSION
+LABEL maintainer="HARUYAMA Seigo <[email protected]>"
+
+WORKDIR /usr/local/bin
+RUN apt update \
+    && apt install -y tini \
+    && rm -rf /var/lib/apt/lists/* \
+    && rm -rf /var/cache/apt/archives/*
+
+ENV HISUI_LYRA_MODEL_COEFFS_PATH /usr/local/lib/lyra/model_coeffs
+ARG UBUNTU_VERSION
+ARG TARGETARCH
+COPY release/ubuntu-${UBUNTU_VERSION}_x86_64/hisui /tmp/hisui-amd64
+COPY release/ubuntu-${UBUNTU_VERSION}_arm64/hisui /tmp/hisui-arm64
+COPY third_party/lyra/lyra/lyra/model_coeffs /usr/local/lib/lyra/model_coeffs
+RUN cp /tmp/hisui-$TARGETARCH /usr/local/bin/hisui
+
+ENTRYPOINT ["/usr/bin/tini", "--", "/usr/local/bin/hisui"]

src/version/version.cpp

@@ -66,7 +66,7 @@ std::string get_fdkaac_aacenc_version() {
 #endif
 
 std::string get_hisui_version() {
-  return "2023.2.0";
+  return "2023.2.1";
 }
 
 std::string get_cppmp4_version() {

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.0", hisui::version::get_hisui_version());
+  BOOST_REQUIRE_EQUAL("2023.2.1", hisui::version::get_hisui_version());
 }
 
 BOOST_AUTO_TEST_SUITE_END()