From d400afde5d28edfba9afbc71008f93b423abf263 Mon Sep 17 00:00:00 2001 From: nanae Date: Tue, 11 Feb 2025 19:57:23 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=E8=BF=BD=E5=8A=A0:=20=E8=B5=B7=E5=8B=95?= =?UTF-8?q?=E5=89=8D=E3=81=ABengine=5Fmanifest.json=E3=82=92=E3=83=81?= =?UTF-8?q?=E3=82=A7=E3=83=83=E3=82=AF=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tools/check_release_build.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/check_release_build.py b/tools/check_release_build.py index 47a0c06d8..cdea484ea 100644 --- a/tools/check_release_build.py +++ b/tools/check_release_build.py @@ -24,6 +24,11 @@ def test_release_build(dist_dir: Path, skip_run_process: bool) -> None: # 起動 process = None if not skip_run_process: + manifest_file = dist_dir / "engine_manifest.json" + assert manifest_file.is_file() + manifest = json.loads(manifest_file.read_text(encoding="utf-8")) + assert "manifest_version" in manifest + process = Popen([run_file.absolute()], cwd=dist_dir) # 起動待機 From b99869cc1dd9c5e9b8fbf51a090e3887621d937f Mon Sep 17 00:00:00 2001 From: nanae Date: Thu, 20 Feb 2025 18:08:42 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=E8=BF=BD=E5=8A=A0:skip=5Fcheck=5Fmanifest?= =?UTF-8?q?=E3=83=95=E3=83=A9=E3=82=B0=E3=82=92=E8=BF=BD=E5=8A=A0=E3=81=97?= =?UTF-8?q?=E3=80=81=E3=81=9D=E3=81=AE=E3=83=95=E3=83=A9=E3=82=B0=E3=82=92?= =?UTF-8?q?=E8=A6=8B=E3=81=A6=E3=83=9E=E3=83=8B=E3=83=95=E3=82=A7=E3=82=B9?= =?UTF-8?q?=E3=83=88=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=81=AE=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E7=A2=BA=E8=AA=8D=E3=82=92=E8=A1=8C=E3=81=86=E3=81=8B?= =?UTF-8?q?=E3=82=92=E5=88=A4=E5=88=A5=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tools/check_release_build.py | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/tools/check_release_build.py b/tools/check_release_build.py index cdea484ea..272cd3ae3 100644 --- a/tools/check_release_build.py +++ b/tools/check_release_build.py @@ -16,19 +16,23 @@ base_url = "http://127.0.0.1:50021/" -def test_release_build(dist_dir: Path, skip_run_process: bool) -> None: +def test_release_build( + dist_dir: Path, skip_run_process: bool, skip_check_manifest: bool +) -> None: run_file = dist_dir / "run" if not run_file.exists(): run_file = dist_dir / "run.exe" - # 起動 - process = None - if not skip_run_process: + # マニフェストファイルの確認 + if not skip_check_manifest: manifest_file = dist_dir / "engine_manifest.json" assert manifest_file.is_file() manifest = json.loads(manifest_file.read_text(encoding="utf-8")) assert "manifest_version" in manifest + # 起動 + process = None + if not skip_run_process: process = Popen([run_file.absolute()], cwd=dist_dir) # 起動待機 @@ -82,5 +86,10 @@ def test_release_build(dist_dir: Path, skip_run_process: bool) -> None: parser = argparse.ArgumentParser() parser.add_argument("--dist_dir", type=Path, default=Path("dist/")) parser.add_argument("--skip_run_process", action="store_true") + parser.add_argument("--skip_check_manifest", action="store_true") args = parser.parse_args() - test_release_build(dist_dir=args.dist_dir, skip_run_process=args.skip_run_process) + test_release_build( + dist_dir=args.dist_dir, + skip_run_process=args.skip_run_process, + skip_check_manifest=args.skip_check_manifest, + ) From 5b70f212119062268442e9e7507cca2025e04737 Mon Sep 17 00:00:00 2001 From: nanae Date: Sat, 22 Feb 2025 18:48:02 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=AD=A3:=20test-engine-container?= =?UTF-8?q?=E3=81=AEcheck=5Frelease=5Fbuild.py=E3=81=AB--skip=5Fcheck=5Fma?= =?UTF-8?q?nifest=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit dockerコンテナで動かしているのでmanifestは存在しないため --- .github/workflows/test-engine-container.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-engine-container.yml b/.github/workflows/test-engine-container.yml index d23b12f32..e06e2e808 100644 --- a/.github/workflows/test-engine-container.yml +++ b/.github/workflows/test-engine-container.yml @@ -68,11 +68,11 @@ jobs: - name: Warm up ENGINE server by waiting run: | set +e # curlのエラーを無視する - + url="http://127.0.0.1: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 @@ -86,4 +86,4 @@ jobs: exit 1 - name: Test ENGINE application docker container - run: python tools/check_release_build.py --skip_run_process --dist_dir dist/ + run: python tools/check_release_build.py --skip_check_manifest --skip_run_process --dist_dir dist/