diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index eec5110..b0c63ab 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -28,8 +28,8 @@ jobs: artifact_name: SoftwareManager-dev-${{ github.sha }}-linux asset_name: SoftwareManager-dev-${{ github.sha }}-linux - os: windows-latest - artifact_name: SoftwareManager-dev-${{ github.sha }}-windows.zip - asset_name: SoftwareManager-dev-${{ github.sha }}-windows.zip + artifact_name: SoftwareManager-dev-${{ github.sha }}-windows.exe + asset_name: SoftwareManager-dev-${{ github.sha }}-windows.exe - os: macos-latest artifact_name: SoftwareManager-dev-${{ github.sha }}-macos asset_name: SoftwareManager-dev-${{ github.sha }}-macos @@ -86,7 +86,7 @@ jobs: if: runner.os == 'Windows' shell: bash run: | - pyinstaller --onedir --windowed \ + pyinstaller --onefile --windowed \ --add-data "build_info.json;." \ --add-data "build_info.json;core" \ --add-data "build_info.json;core/interface" \ @@ -122,21 +122,15 @@ jobs: --name ${{ env.APP_NAME }} \ main.py - - name: Package and rename artifact (Windows) - if: runner.os == 'Windows' - shell: powershell - run: | - cd dist - Compress-Archive -Path '${{ env.APP_NAME }}' -DestinationPath '${{ matrix.artifact_name }}' - Get-ChildItem - - - name: Rename artifact (Unix) + - name: Make executable (Unix) if: runner.os != 'Windows' + run: chmod +x dist/${{ env.APP_NAME }} + + - name: Rename artifact shell: bash run: | cd dist - chmod +x ${{ env.APP_NAME }} - mv ${{ env.APP_NAME }} ${{ matrix.artifact_name }} + mv ${{ env.APP_NAME }}${{ runner.os == 'Windows' && '.exe' || '' }} ${{ matrix.artifact_name }} ls -la - name: Upload build artifact @@ -163,7 +157,7 @@ jobs: mkdir -p release SHORT_SHA="${{ needs.build.outputs.short_sha }}" cp artifacts/ubuntu-22.04-build/SoftwareManager-dev-*-linux release/SoftwareManager-dev-${SHORT_SHA}-linux - cp artifacts/windows-latest-build/SoftwareManager-dev-*-windows.zip release/SoftwareManager-dev-${SHORT_SHA}-windows.zip + cp artifacts/windows-latest-build/SoftwareManager-dev-*-windows.exe release/SoftwareManager-dev-${SHORT_SHA}-windows.exe cp artifacts/macos-latest-build/SoftwareManager-dev-*-macos release/SoftwareManager-dev-${SHORT_SHA}-macos chmod +x release/SoftwareManager-dev-*-linux release/SoftwareManager-dev-*-macos ls -la release/ @@ -181,7 +175,7 @@ jobs: ### Downloads - Linux: \`SoftwareManager-dev-${SHORT_SHA}-linux\` - - Windows: \`SoftwareManager-dev-${SHORT_SHA}-windows.zip\` + - Windows: \`SoftwareManager-dev-${SHORT_SHA}-windows.exe\` - macOS: \`SoftwareManager-dev-${SHORT_SHA}-macos\` EOF cat release_notes.md @@ -194,7 +188,7 @@ jobs: body_path: release_notes.md files: | release/SoftwareManager-dev-${{ needs.build.outputs.short_sha }}-linux - release/SoftwareManager-dev-${{ needs.build.outputs.short_sha }}-windows.zip + release/SoftwareManager-dev-${{ needs.build.outputs.short_sha }}-windows.exe release/SoftwareManager-dev-${{ needs.build.outputs.short_sha }}-macos env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}