From 4609f7d002fde9db65120201db8555f5988e17d6 Mon Sep 17 00:00:00 2001 From: HARUYAMA Seigo Date: Fri, 8 Sep 2023 19:39:51 +0900 Subject: [PATCH 1/3] chore: contain lyra/model_coeffs in tarball --- build.bash | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.bash b/build.bash index 595ceb26..a3b12bdf 100755 --- a/build.bash +++ b/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 From e124d63f3961730d4a5ddcf2f2a150c4b52a3673 Mon Sep 17 00:00:00 2001 From: HARUYAMA Seigo Date: Fri, 8 Sep 2023 19:41:08 +0900 Subject: [PATCH 2/3] fix: upload and download lyra/model_coeffs --- .github/workflows/build.yml | 22 ++++++++++++++++++++++ docker/Dockerfile | 5 +++-- docker/Dockerfile.local | 19 +++++++++++++++++++ 3 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 docker/Dockerfile.local diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bc57aa72..d2e21cff 100644 --- a/.github/workflows/build.yml +++ b/.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 diff --git a/docker/Dockerfile b/docker/Dockerfile index b265f78c..52ffef0d 100644 --- a/docker/Dockerfile +++ b/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"] diff --git a/docker/Dockerfile.local b/docker/Dockerfile.local new file mode 100644 index 00000000..b265f78c --- /dev/null +++ b/docker/Dockerfile.local @@ -0,0 +1,19 @@ +ARG UBUNTU_VERSION +FROM ubuntu:$UBUNTU_VERSION +LABEL maintainer="HARUYAMA Seigo " + +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"] From e62e3e86758affbc9dfa276b77eb3235f5994556 Mon Sep 17 00:00:00 2001 From: voluntas Date: Fri, 8 Sep 2023 22:10:09 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7?= =?UTF-8?q?=E3=83=B3=E3=82=92=E4=B8=8A=E3=81=92=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.md | 5 +++++ VERSION | 2 +- doc/USE.md | 4 ++-- src/version/version.cpp | 2 +- test/version/version_test.cpp | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 7c8a59cf..49a84e7d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -11,6 +11,11 @@ ## develop +## 2023.2.1 + +- [FIX] docker image 生成を修正する + - @haruymaa + ## 2023.2.0 - [UPDATE] 依存ライブラリの更新をする diff --git a/VERSION b/VERSION index 9929fbf7..d3833e27 100644 --- a/VERSION +++ b/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 diff --git a/doc/USE.md b/doc/USE.md index a91301c5..1fba4a7e 100644 --- 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-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] diff --git a/src/version/version.cpp b/src/version/version.cpp index 6a5bd688..beab5de8 100644 --- a/src/version/version.cpp +++ b/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() { diff --git a/test/version/version_test.cpp b/test/version/version_test.cpp index 709ea900..7e57d1b5 100644 --- 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.0", hisui::version::get_hisui_version()); + BOOST_REQUIRE_EQUAL("2023.2.1", hisui::version::get_hisui_version()); } BOOST_AUTO_TEST_SUITE_END()