diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index ef1c735a11..544b20080f 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -76,10 +76,10 @@ jobs: asset_path: deploy/Jamulus-installer-mac.dmg asset_name: jamulus_${{ needs.create_release.outputs.version }}_mac.dmg asset_latest_name: jamulus_latest_mac.dmg - #- os: windows-latest - # asset_path: ${{ github.workspace }}\deploy\Jamulus-installer-win.exe - # asset_latest_name: jamulus_latest_win.exe - # asset_name: jamulus_${{ needs.create_release.outputs.upload_url }}_win.exe + - os: windows-latest + asset_path: deploy\Jamulus-installer-win.exe + asset_latest_name: jamulus_latest_win.exe + asset_name: jamulus_${{ needs.create_release.outputs.upload_url }}_win.exe steps: @@ -88,21 +88,6 @@ jobs: # Get the code - name: Checkout code uses: actions/checkout@v2 - # Install Qt (currently Windows only) - - name: Install Qt (64 Bit) - uses: jurplel/install-qt-action@v2 - if: matrix.config.os == 'windows-latest' - with: - version: '5.15.2' - dir: '${{ github.workspace }}' - arch: 'win64_msvc2019_64' - - name: Install Qt (32 Bit) - uses: jurplel/install-qt-action@v2 - if: matrix.config.os == 'windows-latest' - with: - version: '5.15.2' - dir: '${{ github.workspace }}' - arch: 'win32_msvc2019' ### Build ### @@ -110,7 +95,7 @@ jobs: run: sh linux/autorelease_linux.sh ${{ github.workspace }} if: matrix.config.os == 'ubuntu-18.04' - name: "Build (Windows)" - run: powershell .\windows\deploy_windows.ps1 ${{ github.workspace }}\Qt\5.15.2\; cp deploy\Jamulus*installer-win.exe deploy\Jamulus-installer-win.exe + run: powershell .\windows\autorelease_windows.ps1 -sourcepath "${{ github.workspace }}" if: matrix.config.os == 'windows-latest' - name: "Build (macOS)" run: sh mac/autorelease_mac.sh ${{ github.workspace }} @@ -154,7 +139,7 @@ jobs: asset_path: ${{ matrix.config.asset_path }} asset_name: ${{ matrix.config.asset_latest_name }} asset_content_type: application/octet-stream - - name: Upload Release Asset 2 + - name: Upload latest Release Asset 2 if: matrix.config.asset_latest_name_two != null id: upload-latest-release-asset-two uses: actions/upload-release-asset@v1 diff --git a/.gitignore b/.gitignore index 7978df4ef8..8870ac0b87 100644 --- a/.gitignore +++ b/.gitignore @@ -25,7 +25,6 @@ debug/ release/ build/ deploy/ -debian/ build-gui/ build-nox/ jamulus.sln diff --git a/windows/autorelease_windows.bat b/windows/autorelease_windows.bat deleted file mode 100644 index 6da09c0346..0000000000 --- a/windows/autorelease_windows.bat +++ /dev/null @@ -1 +0,0 @@ -# Sets up the environment for autobuild on Windows diff --git a/windows/autorelease_windows.ps1 b/windows/autorelease_windows.ps1 new file mode 100644 index 0000000000..9d1725ce30 --- /dev/null +++ b/windows/autorelease_windows.ps1 @@ -0,0 +1,19 @@ +# Sets up the environment for autobuild on Windows + +# Get the source path via parameter +param ([string] $sourcepath) + +echo "Install Qt..." +# Install Qt +pip install aqtinstall +echo "Get Qt 64 bit..." +aqt install --outputdir C:\Qt 5.15.2 windows desktop win64_msvc2019_64 +echo "Get Qt 32 bit..." +aqt install --outputdir C:\Qt 5.15.2 windows desktop win32_msvc2019 + +echo "Build installer..." +# Build the installer +powershell "$sourcepath\windows\deploy_windows.ps1" "C:\Qt\5.15.2" + +# Rename the installer +cp "$sourcepath\deploy\Jamulus*installer-win.exe" "$sourcepath\deploy\Jamulus-installer-win.exe"