diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 55e57c1..99cf797 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,17 +15,12 @@ jobs: with: python-version: '3.10' - name: Install dependencies + env: + PYINSTALLER_COMPILE_BOOTLOADER: 1 run: | python -m pip install --upgrade pip setuptools wheel pip install -r requirements.txt - pip install certifi - git clone https://github.com/pyinstaller/pyinstaller.git - cd pyinstaller - git checkout tags/v5.1 - cd bootloader - python waf all - cd .. - pip install -e . + pip install certifi pyinstaller --no-binary pyinstaller - name: Build binary run: pyinstaller -y -F -i CurseBreaker.ico -n CurseBreaker -c --noupx --exclude-module FixTk --exclude-module tcl --exclude-module tk --exclude-module _tkinter --exclude-module tkinter --exclude-module Tkinter CurseBreaker.py - name: Upload binary diff --git a/.gitignore b/.gitignore index 3bf5be4..b763d01 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ WTF-Backup/ /CurseBreaker.reg /Build.sh /.env +*.zip \ No newline at end of file diff --git a/Pipfile.lock b/Pipfile.lock index 92238b5..761a807 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "90dd4d11e8990337dfcd45f4319b17e3773ca1a3e67b9ee8d50cba8223a8497a" + "sha256": "a19718b57450a54763191521929ad9d8ea372239f973ad4ab941ca622b769cd8" }, "pipfile-spec": 6, "requires": { @@ -37,7 +37,7 @@ "sha256:2857e29ff0d34db842cd7ca3230549d1a697f96ee6d3fb071cfa6c7393832597", "sha256:6881edbebdb17b39b4eaaa821b438bf6eddffb4468cf344f09f89def34a8b1df" ], - "markers": "python_version >= '3'", + "markers": "python_full_version >= '3.5.0'", "version": "==2.0.12" }, "checksumdir": { @@ -60,7 +60,7 @@ "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff", "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d" ], - "markers": "python_version >= '3'", + "markers": "python_full_version >= '3.5.0'", "version": "==3.3" }, "lupa": { @@ -192,11 +192,11 @@ }, "requests": { "hashes": [ - "sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61", - "sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d" + "sha256:bc7861137fbce630f17b03d3ad02ad0bf978c844f3536d0edda6499dafce2b6f", + "sha256:d568723a7ebd25875d8d1eaf5dfa068cd2fc8194b2e483d7b1f7c81918dbec6b" ], "index": "pypi", - "version": "==2.27.1" + "version": "==2.28.0" }, "rich": { "hashes": [ @@ -219,7 +219,7 @@ "sha256:44ece4d53fb1706f667c9bd1c648f5469a2ec925fcf3a776667042d645472c14", "sha256:aabaf16477806a5e1dd19aa41f8c2b7950dd3c746362d7e3223dbe6de6ac448e" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_full_version < '4.0.0'", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'", "version": "==1.26.9" }, "wcwidth": {