diff --git a/.github/workflows/ci_release.yml b/.github/workflows/ci_release.yml index ec75240..f6de94a 100644 --- a/.github/workflows/ci_release.yml +++ b/.github/workflows/ci_release.yml @@ -184,14 +184,17 @@ jobs: matrix: # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#choosing-github-hosted-runners include: - - os: ubuntu-latest - TARGET: linux + - os: windows-latest + TARGET: windows + # TODO add --icon + # TODO add --manifest + # TODO find more elegant solution for pyzbar\libiconv.dll and pyzbar\libzbar-64.dll CMD_BUILD: | - pyinstaller -y --add-data $pythonLocation/__yolo_v3_qr_detector/:__yolo_v3_qr_detector/ --onefile src/extract_otp_secrets.py - OUT_FILE_NAME: extract_otp_secrets - ASSET_NAME: extract_otp_secrets_linux_x86_64_ubuntu_latest - ASSET_MIME: application/x-executable - UPLOAD: false + pyinstaller -y --add-data "$($Env:pythonLocation)\__yolo_v3_qr_detector;__yolo_v3_qr_detector" --add-binary "$($Env:pythonLocation)\Lib\site-packages\pyzbar\libiconv.dll;pyzbar" --add-binary "$($Env:pythonLocation)\Lib\site-packages\pyzbar\libzbar-64.dll;pyzbar" --onefile --version-file build\file_version_info.txt src\extract_otp_secrets.py + OUT_FILE_NAME: extract_otp_secrets.exe + ASSET_NAME: extract_otp_secrets_win_x86_64.exe + ASSET_MIME: application/vnd.microsoft.portable-executable + UPLOAD: true - os: macos-11 TARGET: macos # TODO add --icon @@ -206,17 +209,14 @@ jobs: ASSET_NAME: extract_otp_secrets_macos_x86_64 ASSET_MIME: application/x-newton-compatible-pkg UPLOAD: true - - os: windows-latest - TARGET: windows - # TODO add --icon - # TODO add --manifest - # TODO find more elegant solution for pyzbar\libiconv.dll and pyzbar\libzbar-64.dll + - os: ubuntu-latest + TARGET: linux CMD_BUILD: | - pyinstaller -y --add-data "$($Env:pythonLocation)\__yolo_v3_qr_detector;__yolo_v3_qr_detector" --add-binary "$($Env:pythonLocation)\Lib\site-packages\pyzbar\libiconv.dll;pyzbar" --add-binary "$($Env:pythonLocation)\Lib\site-packages\pyzbar\libzbar-64.dll;pyzbar" --onefile --version-file build\file_version_info.txt src\extract_otp_secrets.py - OUT_FILE_NAME: extract_otp_secrets.exe - ASSET_NAME: extract_otp_secrets_win_x86_64.exe - ASSET_MIME: application/vnd.microsoft.portable-executable - UPLOAD: true + pyinstaller -y --add-data $pythonLocation/__yolo_v3_qr_detector/:__yolo_v3_qr_detector/ --onefile src/extract_otp_secrets.py + OUT_FILE_NAME: extract_otp_secrets + ASSET_NAME: extract_otp_secrets_linux_x86_64_ubuntu_latest + ASSET_MIME: application/x-executable + UPLOAD: false steps: - uses: actions/checkout@v3 - name: Set macos macos_python_path