diff --git a/.github/workflows/tag_and_release.yml b/.github/workflows/tag_and_release.yml index 47abcab..928e24d 100644 --- a/.github/workflows/tag_and_release.yml +++ b/.github/workflows/tag_and_release.yml @@ -2,28 +2,30 @@ name: Build and Release on: pull_request: - types: - - opened + types: [opened, edited] jobs: build: - runs-on: ubuntu-latest + runs-on: windows-latest steps: - name: Checkout code uses: actions/checkout@v4 - - name: Set up build environment - run: sudo apt-get update && sudo apt-get install -y build-essential + - name: Set up Python + uses: actions/setup-python@v5 + with: + python-version: '3.13' - name: "Set up virtualenv" run: python -m pip install virtualenv - name: Run Makefile run: make venv all + shell: bash - name: Verify executable exists - run: ls -lh ./dist/aoe_rec_tools.exe + run: dir .\dist\aoe_rec_tools.exe - name: Upload release asset uses: softprops/action-gh-release@v2 diff --git a/Makefile b/Makefile index cd7aecd..1cce936 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,9 @@ # Variables VENV=.venv -PYTHON=$(VENV)/Scripts/python.exe -PIP=$(VENV)/Scripts/pip.exe -ACTIVATE=$(VENV)/Scripts/activate.bat +SCRIPTS=$(VENV)/$(shell if [ -f .venv/bin/pip ]; then echo bin; else echo Scripts; fi) +PYTHON=$(SCRIPTS)/python +PIP=$(SCRIPTS)/pip +FLAKE8=$(SCRIPTS)/flake8 # Default target .PHONY: all help venv install lint test clean build @@ -19,19 +20,21 @@ help: @echo make build - Build into standalone executable venv: + python -m pip install virtualenv python -m venv $(VENV) install: - $(ACTIVATE); $(PIP) install -r requirements.txt + $(PIP) install -r requirements.txt lint: - $(ACTIVATE); $(VENV)/Scripts/flake8 src/ + $(FLAKE8) src/ test: - $(ACTIVATE); $(PYTHON) -m unittest discover test -p "*_tests.py" + $(PYTHON) -m unittest discover test -p "*_tests.py" clean: rm -rf *.pyc __pycache__ build/ dist/ build: clean - $(ACTIVATE); pyinstaller --noconfirm --onefile --name "aoe_rec_tools" src/aoe_rec_tools.py + $(PYTHON) -m pip install pyinstaller + $(PYTHON) -m PyInstaller --noconfirm --onefile --name "aoe_rec_tools" src/aoe_rec_tools.py diff --git a/README.md b/README.md index ff1d8d4..b587411 100644 --- a/README.md +++ b/README.md @@ -5,10 +5,6 @@ A collection of tools for manipulating recorded games of Age of Empires 2 Definitive Edition. -## Features - -- Anonymizing player data in a rec file (Player names, Elo, Chat messages) - ## FAQ Q: **How do I use this?** diff --git a/requirements.txt b/requirements.txt index 2f08b71..ca1ff16 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,3 @@ regex flake8 -pyinstaller click