Skip to content

Commit

Permalink
使用dev进行开发,master进行发布
Browse files Browse the repository at this point in the history
  • Loading branch information
wszqkzqk committed Nov 4, 2022
1 parent 3ef4570 commit 8ae6b88
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 11 deletions.
16 changes: 10 additions & 6 deletions .github/workflows/build-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ concurrency:

on:
pull_request:
push:
branches:
- dev

jobs:
windows:
Expand Down Expand Up @@ -50,7 +53,7 @@ jobs:
uses: ncipollo/release-action@v1
with:
allowUpdates: true
tag: Current.Version.Built.with.Pyinstaller
tag: Dev.Version.Built.with.Pyinstaller
artifacts: ./out/*pyinstaller*.exe
token: ${{ secrets.GITHUB_TOKEN }}

Expand Down Expand Up @@ -78,12 +81,13 @@ jobs:
-o ./out/pypvz-with-python${{ matrix.python_version }}-nuitka-windows-x64.exe `
pypvz.py
# artifact压缩包处上传包含exe和运行环境的文件夹
- name: "Upload binaries"
uses: actions/upload-artifact@v2
- name: Release the version built by nuitka
uses: ncipollo/release-action@v1
with:
name: artifact-windows-python-${{ matrix.python_version }}
path: ./out/*.dist
allowUpdates: true
tag: Dev
artifacts: ./out/*nuitka*.exe
token: ${{ secrets.GITHUB_TOKEN }}


#linux:
Expand Down
9 changes: 4 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,17 +61,16 @@ python pypvz.py
- 可以在仓库的[`Releases`](https://github.com/wszqkzqk/pypvz/releases)页面中[下载最新版(点击跳转)](https://github.com/wszqkzqk/pypvz/releases/latest)(推荐):
- 使用GCC编译
- 程序包含名称、版本等信息
- 得到的验证最多(相对)
- 得到的验证最多
- 并非每次提交都会更新,更新可能不及时
- 也可以直接下载GitHub Workflow[自动利用Nuitka构建的版本(点击跳转)](https://github.com/wszqkzqk/pypvz/releases/tag/Latest)(推荐):
- 使用MSVC编译
- 每次提交均会更新,保证更新及时
- 未进行任何测试,存在bug的概率高于前者
- 可看作本软件的测试版
- 每次合并提交到主分支时更新
- 得到的验证较多
- 服务器构建,编译环境更纯粹,冗余更少,体积更小
- 还可以下载GitHub Workflow[自动利用Pyinstaller构建的版本(点击跳转)](https://github.com/wszqkzqk/pypvz/releases/tag/Current.Version.Built.with.Pyinstaller)
- 在程序闪退时有报错窗口弹出
- 程序性能较差,不推荐
- 其他特性同GitHub Workflow自动利用Nuitka构建的版本
- 均仅支持64位操作系统
- 不依赖python、pygame等外部环境,开箱即用

Expand Down

0 comments on commit 8ae6b88

Please sign in to comment.