From 912e13c72789bdf2cb2625c031bdd172d4c156a3 Mon Sep 17 00:00:00 2001 From: "guorong.zheng" <360996299@qq.com> Date: Mon, 18 Nov 2024 10:58:00 +0800 Subject: [PATCH] feat:arm v7/v8 (#562) --- .github/workflows/main.yml | 4 ++-- Pipfile | 4 +++- README.md | 4 ++-- README_en.md | 4 ++-- docs/tutorial.md | 2 +- docs/tutorial_en.md | 2 +- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d50a29a536c..0eed1ae14b8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -65,8 +65,8 @@ jobs: run: pip3 install --user pipenv - name: Install dependecies run: pipenv --python 3.8 && pipenv install - - name: Build - run: pipenv run build + - name: Update + run: pipenv run dev - name: Commit and push if changed run: | git config --local user.email "github-actions[bot]@users.noreply.github.com" diff --git a/Pipfile b/Pipfile index c7fd52d619d..59509533b45 100644 --- a/Pipfile +++ b/Pipfile @@ -4,9 +4,11 @@ url = "https://mirrors.aliyun.com/pypi/simple" verify_ssl = true [scripts] -build = "python main.py" +dev = "python main.py" ui = "python tkinter_ui/tkinter_ui.py" multicast_tmp = "python updates/multicast/update_tmp.py" +docker_build_driver = "docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8 --build-arg APP_WORKDIR=/tv-driver --build-arg INSTALL_CHROMIUM=true -t guovern/tv-driver . --push" +docker_build_requests = "docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8 --build-arg APP_WORKDIR=/tv-requests -t guovern/tv-requests . --push" [dev-packages] diff --git a/README.md b/README.md index b5f73fa14d2..cb02e9e2a2c 100644 --- a/README.md +++ b/README.md @@ -91,7 +91,7 @@ - ✅ 接口测速验效,响应时间、分辨率优先级,过滤无效接口 - ✅ 偏好设置:IPv6、接口来源排序优先级与数量配置、接口白名单 - ✅ 定时执行,北京时间每日 6:00 与 18:00 执行更新 -- ✅ 支持多种运行方式:工作流、命令行、GUI 软件、Docker(amd64/arm64) +- ✅ 支持多种运行方式:工作流、命令行、GUI 软件、Docker(amd64/arm64/arm v7/arm v8) - ✨ 更多功能请见[配置参数](./docs/config.md) ## 🔗 最新结果 @@ -133,7 +133,7 @@ pipenv install ``` ```python -pipenv run build +pipenv run dev ``` ### 方式三:GUI 软件 diff --git a/README_en.md b/README_en.md index 4c84e615413..2a9deb477f1 100644 --- a/README_en.md +++ b/README_en.md @@ -91,7 +91,7 @@ - ✅ Interface speed testing and verification, with priority on response time and resolution, filtering out ineffective interfaces - ✅ Preferences: IPv6, priority and quantity of interface source sorting, and interface whitelist - ✅ Scheduled execution at 6:00 AM and 18:00 PM Beijing time daily -- ✅ Supports various execution methods: workflows, command line, GUI software, Docker(amd64/arm64) +- ✅ Supports various execution methods: workflows, command line, GUI software, Docker(amd64/arm64/arm v7/arm v8) - ✨ For more features, see [Config parameter](./docs/config_en.md) ## 🔗 Latest results @@ -133,7 +133,7 @@ pipenv install ``` ```python -pipenv run build +pipenv run dev ``` ### Method 3: GUI Software diff --git a/docs/tutorial.md b/docs/tutorial.md index 8b7d24d7366..f62b18a6939 100644 --- a/docs/tutorial.md +++ b/docs/tutorial.md @@ -176,7 +176,7 @@ https://mirror.ghproxy.com/raw.githubusercontent.com/您的github用户名/仓 项目目录下打开终端 CMD 依次运行以下命令: pip install pipenv pipenv install -pipenv run build +pipenv run dev ``` ### 方式三:GUI 软件 diff --git a/docs/tutorial_en.md b/docs/tutorial_en.md index 24f29df6ae3..5a785a07a94 100644 --- a/docs/tutorial_en.md +++ b/docs/tutorial_en.md @@ -173,7 +173,7 @@ Please download and install Python from the official site. During installation, Open a CMD terminal in the project directory and run the following commands in sequence: pip install pipenv pipenv install -pipenv run build +pipenv run dev ``` ### Method 3: GUI Software