diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml index d24a0a0..95424d3 100644 --- a/.github/workflows/default.yml +++ b/.github/workflows/default.yml @@ -220,7 +220,7 @@ jobs: --distpath "${{ env.BUILD_DIR }}/ProjectMac" \ -n "${{ env.PROJECT_NAME }}" pyinstaller.py ls -al "${{ env.BUILD_DIR }}/ProjectMac" - cp -r "${{ env.BUILD_DIR }}/ProjectMac/${{ env.PROJECT_NAME }}.app" . + cp -r "${{ env.BUILD_DIR }}/ProjectMac/${{ env.PROJECT_NAME }}.app" "${{ env.PROJECT_NAME }}.app" zip -r "${{ env.PROJECT_NAME }}-${{ env.VER }}.zip" "${{ env.PROJECT_NAME }}.app" - name: Prepare for deployment @@ -245,14 +245,14 @@ jobs: - name: Deploy Zip uses: actions/upload-artifact@v2.0.1 with: - name: ${{ env.PROJECT_NAME }}-${{ env.VER }}-MacOS + name: ${{ env.PROJECT_NAME }}-${{ env.VER }}-${{ matrix.os }}-zip path: | ${{ env.PROJECT_NAME }}-${{ env.VER }}.zip - name: Deploy DMG uses: actions/upload-artifact@v2.0.1 with: - name: ${{ env.PROJECT_NAME }}_${{ env.VER }}-MacOS + name: ${{ env.PROJECT_NAME }}_${{ env.VER }}-${{ matrix.os}}-dmg path: | ${{ env.PROJECT_NAME }}_${{ env.VER }}.dmg diff --git a/buildPy2App.py b/buildPy2App.py index d78a345..ef9b3c1 100644 --- a/buildPy2App.py +++ b/buildPy2App.py @@ -18,7 +18,7 @@ DATA_FILES = [ ] OPTIONS = { 'iconfile': module_name + '/resources/icon.icns', - 'extra_scripts': 'info.py', + 'extra_scripts': module_name + '/info.py', 'includes': {'PySide6.QtCore', 'PySide6.QtUiTools', 'PySide6.QtGui', 'PySide6.QtWidgets', 'certifi', 'cffi', 'pem'}, 'excludes': {'tkinter'}, 'qt_plugins': [