From 2cd4614a67483d7adcdad915ca0062907d993fe7 Mon Sep 17 00:00:00 2001 From: k-shir0 Date: Sat, 1 Apr 2023 03:04:50 +0900 Subject: [PATCH 1/9] add: release-test-docker.yml --- .github/workflows/release-test-docker.yml | 92 +++++++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 .github/workflows/release-test-docker.yml diff --git a/.github/workflows/release-test-docker.yml b/.github/workflows/release-test-docker.yml new file mode 100644 index 000000000..b1ccb29f0 --- /dev/null +++ b/.github/workflows/release-test-docker.yml @@ -0,0 +1,92 @@ +name: Test Release Build + +on: + workflow_call: + inputs: + version: + type: string + required: true + repo_url: + type: string + required: false + workflow_dispatch: + inputs: + version: + type: string + description: "テストしたいタグ名" + required: true + repo_url: + type: string + description: "リポジトリのURL(省略可能)" + required: false + +env: + REPO_URL: + |- # repo_url指定時はrepo_urlを、それ以外はgithubのリポジトリURLを使用 + ${{ (github.event.inputs || inputs).repo_url || format('{0}/{1}', github.server_url, github.repository) }} + VERSION: |- # version指定時はversionを、それ以外はタグ名を使用 + ${{ (github.event.inputs || inputs).version }} + +jobs: + test: + strategy: + fail-fast: false + matrix: + include: + - os: ubuntu-20.04 + target: linux-cpu + - os: ubuntu-20.04 + target: linux-nvidia + - os: macos-11 + target: macos-x64 + - os: windows-2019 + target: windows-cpu + - os: windows-2019 + target: windows-nvidia + - os: windows-2019 + target: windows-directml + + runs-on: ${{ matrix.os }} + + steps: + - name: declare variables + id: vars + shell: bash + run: | + echo "release_url=${{ env.REPO_URL }}/releases/download/${{ env.VERSION }}" >> $GITHUB_OUTPUT + echo "package_name=voicevox_engine-${{ matrix.target }}-${{ env.VERSION }}" >> $GITHUB_OUTPUT + + - uses: actions/checkout@v2 + + - uses: actions/setup-python@v2 + with: + python-version: "3.8.10" + cache: pip + + - name: Download + shell: bash -euxv {0} + run: | + mkdir -p download + curl -L -o "download/list.txt" "${{ steps.vars.outputs.release_url }}/${{ steps.vars.outputs.package_name }}.7z.txt" + cat "download/list.txt" | xargs -I '%' curl -L -o "download/%" "${{ steps.vars.outputs.release_url }}/%" + 7z x "download/$(head -n1 download/list.txt)" + mv ${{ matrix.target }} dist/ + + - name: chmod +x + if: startsWith(matrix.target, 'linux') || startsWith(matrix.target, 'macos') + shell: bash + run: chmod +x dist/run + + - name: Install libsndfile1 + if: startsWith(matrix.target, 'linux') + run: | + sudo apt-get update + sudo apt-get install libsndfile1 + + - name: Install requirements + run: | + pip install -r requirements-test.txt + + - name: Test + shell: bash + run: python build_util/check_release_build.py --dist_dir dist/ From 39498311dfcae667c3c260d6961c5cce35947092 Mon Sep 17 00:00:00 2001 From: k-shir0 Date: Sat, 1 Apr 2023 03:20:45 +0900 Subject: [PATCH 2/9] =?UTF-8?q?add:=20docker=20=E3=81=AE=E3=83=86=E3=82=B9?= =?UTF-8?q?=E3=83=88=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release-test-docker.yml | 80 ++++++++++++++++------- build_util/check_release_build.py | 24 +++---- 2 files changed, 70 insertions(+), 34 deletions(-) diff --git a/.github/workflows/release-test-docker.yml b/.github/workflows/release-test-docker.yml index b1ccb29f0..c109267d8 100644 --- a/.github/workflows/release-test-docker.yml +++ b/.github/workflows/release-test-docker.yml @@ -1,4 +1,4 @@ -name: Test Release Build +name: Test Docker Release Build on: workflow_call: @@ -21,43 +21,39 @@ on: required: false env: + IMAGE_NAME: ${{ secrets.DOCKERHUB_USERNAME }}/voicevox_engine REPO_URL: |- # repo_url指定時はrepo_urlを、それ以外はgithubのリポジトリURLを使用 ${{ (github.event.inputs || inputs).repo_url || format('{0}/{1}', github.server_url, github.repository) }} VERSION: |- # version指定時はversionを、それ以外はタグ名を使用 ${{ (github.event.inputs || inputs).version }} + TARGET: linux-cpu jobs: test: + runs-on: [ ubuntu-20.04 ] strategy: fail-fast: false matrix: - include: - - os: ubuntu-20.04 - target: linux-cpu - - os: ubuntu-20.04 - target: linux-nvidia - - os: macos-11 - target: macos-x64 - - os: windows-2019 - target: windows-cpu - - os: windows-2019 - target: windows-nvidia - - os: windows-2019 - target: windows-directml - - runs-on: ${{ matrix.os }} + tag: + - "" + - cpu + - cpu-ubuntu20.04 + - cpu-ubuntu18.04 steps: - - name: declare variables + - name: Declare variables id: vars shell: bash run: | echo "release_url=${{ env.REPO_URL }}/releases/download/${{ env.VERSION }}" >> $GITHUB_OUTPUT - echo "package_name=voicevox_engine-${{ matrix.target }}-${{ env.VERSION }}" >> $GITHUB_OUTPUT + echo "package_name=voicevox_engine-${{ env.TARGET }}-${{ env.VERSION }}" >> $GITHUB_OUTPUT - uses: actions/checkout@v2 + # + # Setup Python Environment + # - uses: actions/setup-python@v2 with: python-version: "3.8.10" @@ -70,15 +66,13 @@ jobs: curl -L -o "download/list.txt" "${{ steps.vars.outputs.release_url }}/${{ steps.vars.outputs.package_name }}.7z.txt" cat "download/list.txt" | xargs -I '%' curl -L -o "download/%" "${{ steps.vars.outputs.release_url }}/%" 7z x "download/$(head -n1 download/list.txt)" - mv ${{ matrix.target }} dist/ + mv ${{ env.TARGET }} dist/ - name: chmod +x - if: startsWith(matrix.target, 'linux') || startsWith(matrix.target, 'macos') shell: bash run: chmod +x dist/run - name: Install libsndfile1 - if: startsWith(matrix.target, 'linux') run: | sudo apt-get update sudo apt-get install libsndfile1 @@ -87,6 +81,48 @@ jobs: run: | pip install -r requirements-test.txt + # + # Setup Docker Environment + # + - name: Declare variables + id: docker_vars + run: | + echo "${{ matrix.tag }}" + if [ "${{ matrix.tag }}" != "" ]; then + echo "image_tag=${{ env.IMAGE_NAME }}:${{ matrix.tag }}-${{ env.VERSION }}" >> $GITHUB_OUTPUT + else + echo "image_tag=${{ env.IMAGE_NAME }}:${{ env.VERSION }}" >> $GITHUB_OUTPUT + fi + + - name: Docker pull + run: docker pull ${{ steps.docker_vars.outputs.image_tag }} + + - name: Docker run + run: docker run -d -p 50021:50021 ${{ steps.docker_vars.outputs.image_tag }} + + # Docker コンテナが起動してから、レスポンスが返ってくるまで待機する + # リトライは10回まで `/version` にアクセスしてレスポンスのステータスコードをチェック + # - ステータスコードが `200` の場合は正常終了します + # - ステータスコードが `200` 以外の場合は、5秒間スリープしてリトライします + - name: Wait for container to start + shell: bash -xv {0} + run: | + url="http://localhost:50021/version" + max_attempts=10 + sleep_interval=5 + + for i in $(seq 1 $max_attempts); do + status=$(curl -o /dev/null -s -w '%{http_code}\n' $url) + if [ $status -eq 200 ]; then + echo "Container is ready! Response status code: $status" + exit 0 + else + echo "Attempt $i/$max_attempts: Response status code $status" + sleep $sleep_interval + fi + done + exit 1 + - name: Test shell: bash - run: python build_util/check_release_build.py --dist_dir dist/ + run: python build_util/check_release_build.py --skip_process --dist_dir dist/ diff --git a/build_util/check_release_build.py b/build_util/check_release_build.py index 5b8317c82..416702c1b 100644 --- a/build_util/check_release_build.py +++ b/build_util/check_release_build.py @@ -1,12 +1,8 @@ -""" -ビルド結果をテストする -""" import argparse import json import time from io import BytesIO from pathlib import Path -from subprocess import Popen from urllib.parse import urlencode from urllib.request import Request, urlopen @@ -15,14 +11,16 @@ base_url = "http://localhost:50021/" -def test_release_build(dist_dir: Path) -> None: +def test_release_build(dist_dir: Path, skip_process: bool) -> None: run_file = dist_dir / "run" if not run_file.exists(): run_file = dist_dir / "run.exe" # 起動 - process = Popen([run_file.absolute()], cwd=dist_dir) - time.sleep(120) # 待機 + process = None + if not skip_process: + process = Popen([run_file.absolute()], cwd=dist_dir) + time.sleep(60) # 待機 # バージョン取得テスト req = Request(base_url + "version") @@ -52,15 +50,17 @@ def test_release_build(dist_dir: Path) -> None: manifest = json.loads(res.read().decode("utf-8")) assert "uuid" in manifest - # プロセスが稼働中であることを確認 - assert process.poll() is None + if not skip_process: + # プロセスが稼働中であることを確認 + assert process.poll() is None - # 停止 - process.terminate() + # 停止 + process.terminate() if __name__ == "__main__": parser = argparse.ArgumentParser() parser.add_argument("--dist_dir", type=Path, default=Path("dist/")) + parser.add_argument("--skip_process", action="store_true") args = parser.parse_args() - test_release_build(dist_dir=args.dist_dir) + test_release_build(dist_dir=args.dist_dir, skip_process=args.skip_process) From 294b7eb0d5b4b0b3d5593f49d8e6668e3c6507a1 Mon Sep 17 00:00:00 2001 From: k-shir0 Date: Sat, 1 Apr 2023 21:31:52 +0900 Subject: [PATCH 3/9] =?UTF-8?q?add:=20build-docker=20=E3=81=AB=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-docker.yml | 8 ++++++++ .github/workflows/release-test-docker.yml | 1 - 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index ab7158a45..a5ae84226 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -150,3 +150,11 @@ jobs: cache-from: type=registry,ref=${{ env.IMAGE_TAG }}-buildcache cache-to: type=registry,ref=${{ env.IMAGE_TAG }}-buildcache,mode=max platforms: ${{ matrix.platforms }} + + run-release-test-workflow: + if: env.VOICEVOX_ENGINE_VERSION != 'latest' + needs: [config, upload-to-release] + uses: ./.github/workflows/release-test-docker.yml + with: + version: ${{ needs.config.outputs.version }} + repo_url: ${{ format('{0}/{1}', github.server_url, github.repository) }} # このリポジトリのURL \ No newline at end of file diff --git a/.github/workflows/release-test-docker.yml b/.github/workflows/release-test-docker.yml index c109267d8..d26156da9 100644 --- a/.github/workflows/release-test-docker.yml +++ b/.github/workflows/release-test-docker.yml @@ -87,7 +87,6 @@ jobs: - name: Declare variables id: docker_vars run: | - echo "${{ matrix.tag }}" if [ "${{ matrix.tag }}" != "" ]; then echo "image_tag=${{ env.IMAGE_NAME }}:${{ matrix.tag }}-${{ env.VERSION }}" >> $GITHUB_OUTPUT else From 158d8f06114d5ae85f7db19953c652ed47ab5a78 Mon Sep 17 00:00:00 2001 From: k-shir0 Date: Sun, 2 Apr 2023 18:21:24 +0900 Subject: [PATCH 4/9] =?UTF-8?q?add:=20build-docker=20=E3=81=AE=E5=BE=8C?= =?UTF-8?q?=E3=81=AB=E3=83=86=E3=82=B9=E3=83=88=E3=81=8C=E8=B5=B0=E3=82=8B?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-docker.yml | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index a5ae84226..a58aa54a2 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -17,17 +17,28 @@ env: PYTHON_VERSION: "3.8.10" VOICEVOX_RESOURCE_VERSION: "0.14.1" VOICEVOX_CORE_VERSION: "0.14.2" - VOICEVOX_ENGINE_VERSION: - |- # releaseタグ名か、workflow_dispatchでのバージョン名か、latestが入る - ${{ github.event.release.tag_name || github.event.inputs.version || 'latest' }} jobs: + config: # 全 jobs で利用する定数の定義. `env` が利用できないコンテキストでも利用できる. + runs-on: ubuntu-latest + outputs: + version: ${{ steps.vars.outputs.version }} + version_or_latest: ${{ steps.vars.outputs.version_or_latest }} + steps: + - name: declare variables + id: vars + shell: bash + run: | + : # releaseタグ名か、workflow_dispatchでのバージョン名か、latestが入る + echo "version_or_latest=${{ github.event.release.tag_name || github.event.inputs.version || 'latest' }}" >> $GITHUB_OUTPUT + build-docker: + needs: [ config ] runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest] + os: [ ubuntu-latest ] tag: - "" - cpu @@ -128,8 +139,8 @@ jobs: |- # If it's a release, add the version, otherwise add the `latest` ${{ ( matrix.tag != '' && ( - format('{0}:{1}-{2}', env.IMAGE_NAME, matrix.tag, env.VOICEVOX_ENGINE_VERSION) - ) || format('{0}:{1}', env.IMAGE_NAME, env.VOICEVOX_ENGINE_VERSION) + format('{0}:{1}-{2}', env.IMAGE_NAME, matrix.tag, needs.config.outputs.version_or_latest) + ) || format('{0}:{1}', env.IMAGE_NAME, needs.config.outputs.version_or_latest) ) }} with: context: . @@ -139,7 +150,7 @@ jobs: BASE_IMAGE=${{ matrix.base_image }} BASE_RUNTIME_IMAGE=${{ matrix.base_runtime_image }} PYTHON_VERSION=${{ env.PYTHON_VERSION }} - VOICEVOX_ENGINE_VERSION=${{ env.VOICEVOX_ENGINE_VERSION }} + VOICEVOX_ENGINE_VERSION=${{ needs.config.outputs.version_or_latest }} VOICEVOX_CORE_VERSION=${{ env.VOICEVOX_CORE_VERSION }} VOICEVOX_RESOURCE_VERSION=${{ env.VOICEVOX_RESOURCE_VERSION }} USE_GPU=${{ matrix.target == 'runtime-nvidia-env' }} @@ -152,8 +163,9 @@ jobs: platforms: ${{ matrix.platforms }} run-release-test-workflow: - if: env.VOICEVOX_ENGINE_VERSION != 'latest' - needs: [config, upload-to-release] + # version が指定されている場合のみ実行する + if: needs.config.outputs.version_or_latest != 'latest' + needs: [ config, build-docker ] uses: ./.github/workflows/release-test-docker.yml with: version: ${{ needs.config.outputs.version }} From 81f2d41f621617242c7b7144318ff5f7500b94ae Mon Sep 17 00:00:00 2001 From: k-shir0 Date: Sun, 2 Apr 2023 18:48:17 +0900 Subject: [PATCH 5/9] =?UTF-8?q?fix:=20check=5Frelease=5Fbuild.py=20?= =?UTF-8?q?=E3=81=AB=E3=81=A6=E4=B8=80=E9=83=A8=E3=82=B3=E3=83=BC=E3=83=89?= =?UTF-8?q?=E3=81=8C=E6=84=8F=E5=9B=B3=E3=81=9B=E3=81=9A=E3=81=AB=E6=94=B9?= =?UTF-8?q?=E5=A4=89=E3=81=95=E3=82=8C=E3=81=A6=E3=81=84=E3=81=9F=E3=81=AE?= =?UTF-8?q?=E3=81=A7=E6=88=BB=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build_util/check_release_build.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build_util/check_release_build.py b/build_util/check_release_build.py index 416702c1b..72eaa758e 100644 --- a/build_util/check_release_build.py +++ b/build_util/check_release_build.py @@ -1,8 +1,12 @@ +""" +ビルド結果をテストする +""" import argparse import json import time from io import BytesIO from pathlib import Path +from subprocess import Popen from urllib.parse import urlencode from urllib.request import Request, urlopen From 22510b59ddb4509817f24632dab3b1a034819384 Mon Sep 17 00:00:00 2001 From: k-shir0 Date: Sun, 2 Apr 2023 18:53:56 +0900 Subject: [PATCH 6/9] fix: skip_process -> skip_run_process --- .github/workflows/release-test-docker.yml | 2 +- build_util/check_release_build.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release-test-docker.yml b/.github/workflows/release-test-docker.yml index d26156da9..b7330ccfd 100644 --- a/.github/workflows/release-test-docker.yml +++ b/.github/workflows/release-test-docker.yml @@ -124,4 +124,4 @@ jobs: - name: Test shell: bash - run: python build_util/check_release_build.py --skip_process --dist_dir dist/ + run: python build_util/check_release_build.py --skip_run_process --dist_dir dist/ diff --git a/build_util/check_release_build.py b/build_util/check_release_build.py index 72eaa758e..10ca9488c 100644 --- a/build_util/check_release_build.py +++ b/build_util/check_release_build.py @@ -15,14 +15,14 @@ base_url = "http://localhost:50021/" -def test_release_build(dist_dir: Path, skip_process: bool) -> None: +def test_release_build(dist_dir: Path, skip_run_process: bool) -> None: run_file = dist_dir / "run" if not run_file.exists(): run_file = dist_dir / "run.exe" # 起動 process = None - if not skip_process: + if not skip_run_process: process = Popen([run_file.absolute()], cwd=dist_dir) time.sleep(60) # 待機 @@ -54,7 +54,7 @@ def test_release_build(dist_dir: Path, skip_process: bool) -> None: manifest = json.loads(res.read().decode("utf-8")) assert "uuid" in manifest - if not skip_process: + if not skip_run_process: # プロセスが稼働中であることを確認 assert process.poll() is None @@ -65,6 +65,6 @@ def test_release_build(dist_dir: Path, skip_process: bool) -> None: if __name__ == "__main__": parser = argparse.ArgumentParser() parser.add_argument("--dist_dir", type=Path, default=Path("dist/")) - parser.add_argument("--skip_process", action="store_true") + parser.add_argument("--skip_run_process", action="store_true") args = parser.parse_args() - test_release_build(dist_dir=args.dist_dir, skip_process=args.skip_process) + test_release_build(dist_dir=args.dist_dir, skip_run_process=args.skip_run_process) From df67d888c76b109a52fa94876739774d560b2564 Mon Sep 17 00:00:00 2001 From: k-shir0 Date: Tue, 4 Apr 2023 00:08:38 +0900 Subject: [PATCH 7/9] fix: localhost -> 127.0.0.1 --- .github/workflows/release-test-docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-test-docker.yml b/.github/workflows/release-test-docker.yml index b7330ccfd..1341e4d70 100644 --- a/.github/workflows/release-test-docker.yml +++ b/.github/workflows/release-test-docker.yml @@ -106,7 +106,7 @@ jobs: - name: Wait for container to start shell: bash -xv {0} run: | - url="http://localhost:50021/version" + url="http://127.0.0.1:50021/version" max_attempts=10 sleep_interval=5 From 2960c188dc1f8273bc3c3581edb301509a357011 Mon Sep 17 00:00:00 2001 From: k-shir0 Date: Thu, 6 Apr 2023 00:26:11 +0900 Subject: [PATCH 8/9] =?UTF-8?q?fix:=20=E4=B8=8D=E8=A6=81=E3=81=AA=E3=82=B3?= =?UTF-8?q?=E3=83=BC=E3=83=89=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-docker.yml | 1 - .github/workflows/release-test-docker.yml | 28 ----------------------- 2 files changed, 29 deletions(-) diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index 96689e294..6f32aff48 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -22,7 +22,6 @@ jobs: config: # 全 jobs で利用する定数の定義. `env` が利用できないコンテキストでも利用できる. runs-on: ubuntu-latest outputs: - version: ${{ steps.vars.outputs.version }} version_or_latest: ${{ steps.vars.outputs.version_or_latest }} steps: - name: declare variables diff --git a/.github/workflows/release-test-docker.yml b/.github/workflows/release-test-docker.yml index 1341e4d70..247b2c6d9 100644 --- a/.github/workflows/release-test-docker.yml +++ b/.github/workflows/release-test-docker.yml @@ -15,19 +15,11 @@ on: type: string description: "テストしたいタグ名" required: true - repo_url: - type: string - description: "リポジトリのURL(省略可能)" - required: false env: IMAGE_NAME: ${{ secrets.DOCKERHUB_USERNAME }}/voicevox_engine - REPO_URL: - |- # repo_url指定時はrepo_urlを、それ以外はgithubのリポジトリURLを使用 - ${{ (github.event.inputs || inputs).repo_url || format('{0}/{1}', github.server_url, github.repository) }} VERSION: |- # version指定時はversionを、それ以外はタグ名を使用 ${{ (github.event.inputs || inputs).version }} - TARGET: linux-cpu jobs: test: @@ -42,13 +34,6 @@ jobs: - cpu-ubuntu18.04 steps: - - name: Declare variables - id: vars - shell: bash - run: | - echo "release_url=${{ env.REPO_URL }}/releases/download/${{ env.VERSION }}" >> $GITHUB_OUTPUT - echo "package_name=voicevox_engine-${{ env.TARGET }}-${{ env.VERSION }}" >> $GITHUB_OUTPUT - - uses: actions/checkout@v2 # @@ -59,19 +44,6 @@ jobs: python-version: "3.8.10" cache: pip - - name: Download - shell: bash -euxv {0} - run: | - mkdir -p download - curl -L -o "download/list.txt" "${{ steps.vars.outputs.release_url }}/${{ steps.vars.outputs.package_name }}.7z.txt" - cat "download/list.txt" | xargs -I '%' curl -L -o "download/%" "${{ steps.vars.outputs.release_url }}/%" - 7z x "download/$(head -n1 download/list.txt)" - mv ${{ env.TARGET }} dist/ - - - name: chmod +x - shell: bash - run: chmod +x dist/run - - name: Install libsndfile1 run: | sudo apt-get update From 2e947e4b46b017feda78579aefa64bb054c97a1c Mon Sep 17 00:00:00 2001 From: k-shir0 Date: Tue, 11 Apr 2023 00:06:25 +0900 Subject: [PATCH 9/9] =?UTF-8?q?delete:=20ubuntu18.04=20=E3=81=AE=E3=82=B5?= =?UTF-8?q?=E3=83=9D=E3=83=BC=E3=83=88=E3=81=AF=E7=B5=82=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-docker.yml | 15 --------------- .github/workflows/release-test-docker.yml | 1 - 2 files changed, 16 deletions(-) diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index 6f32aff48..3c2c28c61 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -44,8 +44,6 @@ jobs: - cpu-ubuntu20.04 - nvidia - nvidia-ubuntu20.04 - - cpu-ubuntu18.04 - - nvidia-ubuntu18.04 include: # Ubuntu 20.04 - tag: "" @@ -78,19 +76,6 @@ jobs: base_runtime_image: nvidia/cuda:11.6.2-cudnn8-runtime-ubuntu20.04 onnxruntime_version: 1.13.1 platforms: linux/amd64 - # Ubuntu 18.04 - - tag: cpu-ubuntu18.04 - target: runtime-env - base_image: ubuntu:18.04 - base_runtime_image: ubuntu:18.04 - onnxruntime_version: 1.13.1 - platforms: linux/amd64,linux/arm64/v8 - - tag: nvidia-ubuntu18.04 - target: runtime-nvidia-env - base_image: ubuntu:18.04 - base_runtime_image: nvidia/cuda:11.6.2-cudnn8-runtime-ubuntu18.04 - onnxruntime_version: 1.13.1 - platforms: linux/amd64 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/release-test-docker.yml b/.github/workflows/release-test-docker.yml index 247b2c6d9..61019b2fd 100644 --- a/.github/workflows/release-test-docker.yml +++ b/.github/workflows/release-test-docker.yml @@ -31,7 +31,6 @@ jobs: - "" - cpu - cpu-ubuntu20.04 - - cpu-ubuntu18.04 steps: - uses: actions/checkout@v2