Browse Source

fix python error (dulwich)

synchronized workflow yml files
pull/385/head ahoy_v0.5.28
lumapu 2 years ago
parent
commit
2e08ee04bd
  1. 20
      .github/workflows/compile_esp8266.yml
  2. 2
      tools/esp8266/scripts/auto_firmware_version.py

20
.github/workflows/compile_esp8266.yml

@ -20,32 +20,38 @@ jobs:
id: short-sha
with:
length: 7
- name: cache-pip
- name: Cache Pip
uses: actions/cache@v3
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
restore-keys: |
${{ runner.os }}-pip-
- name: cache-platformio
- name: Cache PlatformIO
uses: actions/cache@v3
with:
path: ~/.platformio
key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
- name: setup-python
- name: Setup Python
uses: actions/setup-python@v4.3.0
with:
python-version: '3.10'
- name: install-platformio
python-version: "3.x"
- name: Install PlatformIO
run: |
python -m pip install --upgrade pip
pip install --upgrade platformio
- name: update-html
- name: Convert HTML files
working-directory: tools/esp8266/html
run: python convert.py
- name: Run PlatformIO
run: pio run -d tools/esp8266 --environment esp8266-release --environment esp8266-1m-release --environment esp32-wroom32-release
- name: rename-binary-files
- name: Rename Binary files
id: rename-binary-files
working-directory: tools/esp8266/scripts
run: python getVersion.py

2
tools/esp8266/scripts/auto_firmware_version.py

@ -11,7 +11,7 @@ installed_pkgs = {pkg.key for pkg in pkg_resources.working_set}
missing_pkgs = required_pkgs - installed_pkgs
if missing_pkgs:
env.Execute('"$PYTHONEXE" -m pip install dulwich --global-option="--pure"')
env.Execute('"$PYTHONEXE" -m pip install dulwich')
from dulwich import porcelain

Loading…
Cancel
Save