Merge branch 'develop' of github.com:shiguredo/hisui into develop

shiguredo · Sep 8, 2023 · 0301bef · 0301bef
2 parents e62e3e8 + 739dbde
commit 0301bef
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 2 deletions.
diff --git 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/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
diff --git 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
@@ -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"]