Skip to content

Commit e464f9b

Browse files
committed
Update build-macos.yml
1 parent 0679965 commit e464f9b

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

.github/workflows/build-macos.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,9 @@ jobs:
3939
# Build the installer
4040
- name: Build Mac Installer
4141
run: |
42-
pyinstaller --windowed -n RTKUploader --noconsole --distpath=. --icon=RTK_Firmware_Uploader/resource/RTK.ico --add-data="RTK_Firmware_Uploader/resource/*:resource/" RTK_Firmware_Upload.py
4342
ESPTOOL_LOCATION=$(pip show esptool | grep "Location: " | cut -c 11- | tr -d '\n')
44-
ESPTOOL_TARGETS=$(echo "${ESPTOOL_LOCATION}/esptool/targets/stub_flasher")
45-
mkdir -p "RTKUploader.app/Contents/MacOS/esptool/targets/stub_flasher"
46-
cp -r "${ESPTOOL_TARGETS}" "RTKUploader.app/Contents/MacOS/esptool/targets/stub_flasher"
43+
ESPTOOL_TARGETS=$(echo "${ESPTOOL_LOCATION}/esptool/targets/stub_flasher/*:../MacOS/esptool/targets/stub_flasher/")
44+
pyinstaller --windowed -n RTKUploader --noconsole --distpath=. --icon=RTK_Firmware_Uploader/resource/RTK.ico --add-data="RTK_Firmware_Uploader/resource/*:resource/" --add-data="${ESPTOOL_TARGETS}" RTK_Firmware_Upload.py
4745
mkdir tmp
4846
mv "RTKUploader.app" "tmp/"
4947
create-dmg --volicon "RTK_Firmware_Uploader/resource/sparkdisk.icns" --background "RTK_Firmware_Uploader/resource/sfe_logo_med.png" --hide-extension "RTKUploader.app" --icon "RTKUploader.app" 100 100 --window-size 600 440 --app-drop-link 400 100 "RTKUploader.dmg" "tmp/"

0 commit comments

Comments
 (0)