From c6186266d6b1854d088ca7519dced27b16779faa Mon Sep 17 00:00:00 2001 From: winlin Date: Tue, 31 Oct 2023 17:41:01 +0800 Subject: [PATCH] Update --- .github/workflows/release-cn.yml | 4 ++-- .github/workflows/release-en.yml | 4 ++-- Dockerfile.cn.dist | 4 ++-- Dockerfile.en.dist | 4 ++-- auto/build-cn-stage0.sh | 5 +++-- auto/build-cn-stage1.sh | 5 +++-- auto/build-en-stage0.sh | 5 +++-- auto/build-en-stage1.sh | 5 +++-- 8 files changed, 20 insertions(+), 16 deletions(-) diff --git a/.github/workflows/release-cn.yml b/.github/workflows/release-cn.yml index 64876bd4..aa44167a 100644 --- a/.github/workflows/release-cn.yml +++ b/.github/workflows/release-cn.yml @@ -84,7 +84,7 @@ jobs: - uses: actions/upload-artifact@v2 with: name: zh-cn - path: build/zh-cn.tar.bz2 + path: build/zh-cn.tar docker1: name: docker1 @@ -102,7 +102,7 @@ jobs: - uses: actions/upload-artifact@v2 with: name: en-us - path: build/en-us.tar.bz2 + path: build/en-us.tar docker: name: docker diff --git a/.github/workflows/release-en.yml b/.github/workflows/release-en.yml index 9e71939d..4d25a3a8 100644 --- a/.github/workflows/release-en.yml +++ b/.github/workflows/release-en.yml @@ -94,7 +94,7 @@ jobs: - uses: actions/upload-artifact@v2 with: name: zh-cn - path: build/zh-cn.tar.bz2 + path: build/zh-cn.tar docker1: name: docker1 @@ -112,7 +112,7 @@ jobs: - uses: actions/upload-artifact@v2 with: name: en-us - path: build/en-us.tar.bz2 + path: build/en-us.tar docker: name: docker diff --git a/Dockerfile.cn.dist b/Dockerfile.cn.dist index b62dd36b..fc2a0eef 100644 --- a/Dockerfile.cn.dist +++ b/Dockerfile.cn.dist @@ -5,8 +5,8 @@ FROM ossrs/httpx:1 AS dist EXPOSE 80 443 -ADD build/zh-cn.tar.bz2 /usr/local/srs-docs/ -ADD build/en-us.tar.bz2 /usr/local/srs-docs/ +ADD build/zh-cn.tar /usr/local/srs-docs/ +ADD build/en-us.tar /usr/local/srs-docs/ RUN cd /usr/local/srs-docs && ln -sf . lts && du -sh * && \ du -sh zh-cn/* && du -sh en-us/* diff --git a/Dockerfile.en.dist b/Dockerfile.en.dist index b62dd36b..fc2a0eef 100644 --- a/Dockerfile.en.dist +++ b/Dockerfile.en.dist @@ -5,8 +5,8 @@ FROM ossrs/httpx:1 AS dist EXPOSE 80 443 -ADD build/zh-cn.tar.bz2 /usr/local/srs-docs/ -ADD build/en-us.tar.bz2 /usr/local/srs-docs/ +ADD build/zh-cn.tar /usr/local/srs-docs/ +ADD build/en-us.tar /usr/local/srs-docs/ RUN cd /usr/local/srs-docs && ln -sf . lts && du -sh * && \ du -sh zh-cn/* && du -sh en-us/* diff --git a/auto/build-cn-stage0.sh b/auto/build-cn-stage0.sh index 9dae63f5..9889f940 100644 --- a/auto/build-cn-stage0.sh +++ b/auto/build-cn-stage0.sh @@ -8,8 +8,9 @@ yarn cross-env REGION='zh-cn' BASE_URL='/lts/zh-cn/' \ SEARCH_HTTPS_HOST=ossrs.net SEARCH_HTTPS_PORT=443 \ SEARCH_HTTP_HOST=ossrs.net SEARCH_HTTP_PORT=80 \ SEARCH_APIKEY=$SEARCH_APIKEY \ - docusaurus build --locale zh-cn --out-dir build/zh-cn + docusaurus build --locale zh-cn --out-dir build/zh-cn && -(cd build && tar jcf zh-cn.tar.bz2 zh-cn) +(cd build && tar cf zh-cn.tar zh-cn) && du -sh build/* +if [[ $? -ne 0 ]]; then echo "Build fail"; exit 1; fi diff --git a/auto/build-cn-stage1.sh b/auto/build-cn-stage1.sh index 2d7beda3..46023707 100644 --- a/auto/build-cn-stage1.sh +++ b/auto/build-cn-stage1.sh @@ -8,8 +8,9 @@ yarn cross-env REGION='zh-cn' BASE_URL='/lts/en-us/' \ SEARCH_HTTPS_HOST=ossrs.net SEARCH_HTTPS_PORT=443 \ SEARCH_HTTP_HOST=ossrs.net SEARCH_HTTP_PORT=80 \ SEARCH_APIKEY=$SEARCH_APIKEY \ - docusaurus build --locale en-us --out-dir build/en-us + docusaurus build --locale en-us --out-dir build/en-us && -(cd build && tar jcf en-us.tar.bz2 en-us) +(cd build && tar cf en-us.tar en-us) && du -sh build/* +if [[ $? -ne 0 ]]; then echo "Build fail"; exit 1; fi diff --git a/auto/build-en-stage0.sh b/auto/build-en-stage0.sh index 61e41c11..73614816 100644 --- a/auto/build-en-stage0.sh +++ b/auto/build-en-stage0.sh @@ -8,8 +8,9 @@ yarn cross-env REGION='zh-cn' BASE_URL='/lts/zh-cn/' \ SEARCH_HTTPS_HOST=ossrs.io SEARCH_HTTPS_PORT=443 \ SEARCH_HTTP_HOST=ossrs.io SEARCH_HTTP_PORT=80 \ SEARCH_APIKEY=$SEARCH_APIKEY \ - docusaurus build --locale zh-cn --out-dir build/zh-cn + docusaurus build --locale zh-cn --out-dir build/zh-cn && -(cd build && tar jcf zh-cn.tar.bz2 zh-cn) +(cd build && tar cf zh-cn.tar zh-cn) && du -sh build/* +if [[ $? -ne 0 ]]; then echo "Build fail"; exit 1; fi diff --git a/auto/build-en-stage1.sh b/auto/build-en-stage1.sh index 0eaf689d..9ebb6d4d 100644 --- a/auto/build-en-stage1.sh +++ b/auto/build-en-stage1.sh @@ -8,8 +8,9 @@ yarn cross-env REGION='zh-cn' BASE_URL='/lts/en-us/' \ SEARCH_HTTPS_HOST=ossrs.io SEARCH_HTTPS_PORT=443 \ SEARCH_HTTP_HOST=ossrs.io SEARCH_HTTP_PORT=80 \ SEARCH_APIKEY=$SEARCH_APIKEY \ - docusaurus build --locale en-us --out-dir build/en-us + docusaurus build --locale en-us --out-dir build/en-us && -(cd build && tar jcf en-us.tar.bz2 en-us) +(cd build && tar cf en-us.tar en-us) && du -sh build/* +if [[ $? -ne 0 ]]; then echo "Build fail"; exit 1; fi