2828 pip install -e .
2929 pip install --force-reinstall -v pyinstaller==4.10
3030 pip install --force-reinstall -v pyinstaller-hooks-contrib==2023.2
31- python -m PyInstaller.__main__ -F -w -n FujiNet-Flasher -i icon.ico --collect-submodules esptool esphomeflasher\__main__.py
31+ python -m PyInstaller.__main__ -F -w -n FujiNet-Flasher -i icon.ico `
32+ --add-data "./.venv/lib/site-packages/esptool/targets/stub_flasher/1/*.json;esptool/targets/stub_flasher/1" `
33+ --add-data "./.venv/lib/site-packages/esptool/targets/stub_flasher/2/*.json;esptool/targets/stub_flasher/2" `
34+ --collect-submodules esptool `
35+ esphomeflasher\__main__.py
3236 - uses : actions/upload-artifact@master
3337 with :
3438 name : FujiNet-Flasher_win-x64
@@ -48,18 +52,22 @@ jobs:
4852 run : |
4953 python --version
5054 pip --version
51- - name: Update, Install & Build in virtual python environment
52- shell: pwsh
53- run: |
54- python -m venv .venv
55- .\.venv\Scripts\Activate.ps1
56- python -m pip uninstall -y esptool
57- python -m pip install "esptool>=4.7"
58- pip install -r requirements_build.txt
59- pip install -e .
60- pip install --force-reinstall -v pyinstaller==4.10
61- pip install --force-reinstall -v pyinstaller-hooks-contrib==2023.2
62- python -m PyInstaller.__main__ -F -w -n FujiNet-Flasher -i icon.ico --collect-submodules esptool esphomeflasher\__main__.py
55+ - name : Update, Install & Build in virtual python environment
56+ shell : pwsh
57+ run : |
58+ python -m venv .venv
59+ .\.venv\Scripts\Activate.ps1
60+ python -m pip uninstall -y esptool
61+ python -m pip install "esptool>=4.7"
62+ pip install -r requirements_build.txt
63+ pip install -e .
64+ pip install --force-reinstall -v pyinstaller==4.10
65+ pip install --force-reinstall -v pyinstaller-hooks-contrib==2023.2
66+ python -m PyInstaller.__main__ -F -w -n FujiNet-Flasher -i icon.ico `
67+ --add-data "./.venv/lib/site-packages/esptool/targets/stub_flasher/1/*.json;esptool/targets/stub_flasher/1" `
68+ --add-data "./.venv/lib/site-packages/esptool/targets/stub_flasher/2/*.json;esptool/targets/stub_flasher/2" `
69+ --collect-submodules esptool `
70+ esphomeflasher\__main__.py
6371 - name : See dist directory
6472 run : ls dist
6573 - name : Upload Artifact
8997 - name : Run PyInstaller
9098 run : |
9199 export STUBS_DIR="$(pip show esptool | grep "Location: " | cut -c 11- | tr -d '\n')/esptool/targets/stub_flasher/"
92- python -m PyInstaller.__main__ -F -w -n FujiNet-Flasher -i icon.ico --add-data="${STUBS_DIR}/1/*.json:esptool/targets/stub_flasher/1/" --add-data="${STUBS_DIR}/2/*.json:esptool/targets/stub_flasher/2/" esphomeflasher/__main__.py
100+ python -m PyInstaller.__main__ -F -w -n FujiNet-Flasher -i icon.ico \
101+ --add-data="${STUBS_DIR}/1/*.json:esptool/targets/stub_flasher/1/" \
102+ --add-data="${STUBS_DIR}/2/*.json:esptool/targets/stub_flasher/2/" \
103+ esphomeflasher/__main__.py
93104 - name : See dist directory
94105 run : ls dist
95106 - name : Upload Artifact
@@ -122,7 +133,10 @@ jobs:
122133 python -m pip install -r requirements_build.txt
123134 export STUBS_DIR="$(pip show esptool | grep "Location: " | cut -c 11- | tr -d '\n')/esptool/targets/stub_flasher/"
124135 ls -al ${STUBS_DIR}
125- python -m PyInstaller.__main__ -F -w -n FujiNet-Flasher -i icon.icns --add-data="${STUBS_DIR}/1/*.json:esptool/targets/stub_flasher/1/" --add-data="${STUBS_DIR}/2/*.json:esptool/targets/stub_flasher/2/" esphomeflasher/__main__.py
136+ python -m PyInstaller.__main__ -F -w -n FujiNet-Flasher -i icon.icns \
137+ --add-data="${STUBS_DIR}/1/*.json:esptool/targets/stub_flasher/1/" \
138+ --add-data="${STUBS_DIR}/2/*.json:esptool/targets/stub_flasher/2/" \
139+ esphomeflasher/__main__.py
126140 - name : Remove Extra Binary
127141 run : rm dist/FujiNet-Flasher
128142 - name : Set binary permissions
@@ -171,7 +185,10 @@ jobs:
171185 pip3 install -r requirements_build.txt
172186 export STUBS_DIR="$(pip3 show esptool | grep "Location: " | cut -c 11- | tr -d '\n')/esptool/targets/stub_flasher/"
173187 ls -al ${STUBS_DIR}
174- python3 -m PyInstaller.__main__ -F -w -n FujiNet-Flasher -i icon.icns --add-data="${STUBS_DIR}/1/*.json:esptool/targets/stub_flasher/1/" --add-data="${STUBS_DIR}/2/*.json:esptool/targets/stub_flasher/2/" esphomeflasher/__main__.py
188+ python3 -m PyInstaller.__main__ -F -w -n FujiNet-Flasher -i icon.icns \
189+ --add-data="${STUBS_DIR}/1/*.json:esptool/targets/stub_flasher/1/" \
190+ --add-data="${STUBS_DIR}/2/*.json:esptool/targets/stub_flasher/2/" \
191+ esphomeflasher/__main__.py
175192 - name : Remove Extra Binary
176193 run : rm dist/FujiNet-Flasher
177194 - name : Set binary permissions
0 commit comments