diff --git a/.github/workflows/publish-studio-linux.yaml b/.github/workflows/publish-studio-linux.yaml index 6884cfaf..6824c6e5 100644 --- a/.github/workflows/publish-studio-linux.yaml +++ b/.github/workflows/publish-studio-linux.yaml @@ -39,18 +39,18 @@ jobs: command: c files: ./ cwd: ./out - outPath: ./out/OneWareStudio-${{ steps.get-oneware-version.outputs.info }}-x64.tar.gz + outPath: ./out/OneWareStudio-${{ steps.get-oneware-version.outputs.info }}-linux-x64.tgz - uses: ncipollo/release-action@v1 with: tag: ${{ steps.get-oneware-version.outputs.info }} - artifacts: "./out/*.tar.gz" + artifacts: "./out/*.tgz" allowUpdates: true omitBodyDuringUpdate: True omitNameDuringUpdate: True omitPrereleaseDuringUpdate: True omitDraftDuringUpdate: True - name: Create VersionInfo x64 - run: echo "${{ steps.get-oneware-version.outputs.info }}|https://cdn.one-ware.com/onewarestudio/${{ steps.get-oneware-version.outputs.info }}/OneWareStudio-${{ steps.get-oneware-version.outputs.info }}-x64.tar.gz" > ./out/linux-x64.txt + run: echo "${{ steps.get-oneware-version.outputs.info }}|https://github.com/one-ware/OneWare/releases/download/${{ steps.get-oneware-version.outputs.info }}/OneWareStudio-${{ steps.get-oneware-version.outputs.info }}-linux-x64.tgz" > ./out/linux-x64.txt - uses: joutvhu/ftp-transfer@v1 name: Upload with: @@ -59,5 +59,5 @@ jobs: password: ${{ secrets.ONEWARE_FTP }} commands: | mkdir ./cdn.one-ware.com/onewarestudio/${{ steps.get-oneware-version.outputs.info }} - put ./out/OneWareStudio-${{ steps.get-oneware-version.outputs.info }}-x64.tar.gz ./cdn.one-ware.com/onewarestudio/${{ steps.get-oneware-version.outputs.info }}/OneWareStudio-${{ steps.get-oneware-version.outputs.info }}-x64.tar.gz + put ./out/OneWareStudio-${{ steps.get-oneware-version.outputs.info }}-x64.tgz ./cdn.one-ware.com/onewarestudio/${{ steps.get-oneware-version.outputs.info }}/OneWareStudio-${{ steps.get-oneware-version.outputs.info }}-linux-x64.tgz put ./out/linux-x64.txt ./cdn.one-ware.com/onewarestudio/linux-x64.txt diff --git a/.github/workflows/publish-studio-macos.yml b/.github/workflows/publish-studio-macos.yml index 9d8748bf..e2e6735c 100644 --- a/.github/workflows/publish-studio-macos.yml +++ b/.github/workflows/publish-studio-macos.yml @@ -42,8 +42,8 @@ jobs: run: ./CreateAppBundle.sh - name: Rename Packages run: | - mv ./studio/OneWare.Studio.Desktop.MacOSInstaller/publish/OneWareStudio-x64.dmg ./studio/OneWare.Studio.Desktop.MacOSInstaller/publish/OneWareStudio-${{ steps.get-oneware-version.outputs.info }}-x64.msi - mv ./studio/OneWare.Studio.Desktop.MacOSInstaller/publish/OneWareStudio-arm64.dmg ./studio/OneWare.Studio.Desktop.MacOSInstaller/publish/OneWareStudio-${{ steps.get-oneware-version.outputs.info }}-x64.msi + mv ./studio/OneWare.Studio.Desktop.MacOSInstaller/publish/OneWareStudio-x64.dmg ./studio/OneWare.Studio.Desktop.MacOSInstaller/publish/OneWareStudio-${{ steps.get-oneware-version.outputs.info }}-osx-x64.dmg + mv ./studio/OneWare.Studio.Desktop.MacOSInstaller/publish/OneWareStudio-arm64.dmg ./studio/OneWare.Studio.Desktop.MacOSInstaller/publish/OneWareStudio-${{ steps.get-oneware-version.outputs.info }}-osx-arm64.dmg - uses: ncipollo/release-action@v1 with: tag: ${{ steps.get-oneware-version.outputs.info }} @@ -60,9 +60,9 @@ jobs: shell: pwsh run: ((Get-Content -path ./studio/OneWare.Studio.Desktop.MacOSInstaller/MacOSDownloadTemplate-arm64.htm -Raw) -replace '\$version\$', '${{ steps.get-oneware-version.outputs.info }}') | Set-Content -NoNewline -Path ./out/MacOSDownload-arm64.htm -Encoding UTF8 - name: Create VersionInfo x64 - run: echo "${{ steps.get-oneware-version.outputs.info }}|https://cdn.one-ware.com/onewarestudio/${{ steps.get-oneware-version.outputs.info }}/OneWareStudio-${{ steps.get-oneware-version.outputs.info }}-x64.dmg" > ./out/osx-x64.txt + run: echo "${{ steps.get-oneware-version.outputs.info }}|https://github.com/one-ware/OneWare/releases/download/${{ steps.get-oneware-version.outputs.info }}/OneWareStudio-${{ steps.get-oneware-version.outputs.info }}-osx-x64.dmg" > ./out/osx-x64.txt - name: Create VersionInfo arm64 - run: echo "${{ steps.get-oneware-version.outputs.info }}|https://cdn.one-ware.com/onewarestudio/${{ steps.get-oneware-version.outputs.info }}/OneWareStudio-${{ steps.get-oneware-version.outputs.info }}-arm64.dmg" > ./out/osx-arm64.txt + run: echo "${{ steps.get-oneware-version.outputs.info }}|https://github.com/one-ware/OneWare/releases/download/${{ steps.get-oneware-version.outputs.info }}/OneWareStudio-${{ steps.get-oneware-version.outputs.info }}-osx-arm64.dmg" > ./out/osx-arm64.txt - uses: joutvhu/ftp-transfer@v1 name: Upload with: @@ -71,8 +71,8 @@ jobs: password: ${{ secrets.ONEWARE_FTP }} commands: | mkdir ./cdn.one-ware.com/onewarestudio/${{ steps.get-oneware-version.outputs.info }} - put ./studio/OneWare.Studio.Desktop.MacOSInstaller/publish/OneWareStudio-${{ steps.get-oneware-version.outputs.info }}-x64.msi ./cdn.one-ware.com/onewarestudio/${{ steps.get-oneware-version.outputs.info }}/OneWareStudio-${{ steps.get-oneware-version.outputs.info }}-x64.dmg - put ./studio/OneWare.Studio.Desktop.MacOSInstaller/publish/OneWareStudio-${{ steps.get-oneware-version.outputs.info }}-arm64.msi ./cdn.one-ware.com/onewarestudio/${{ steps.get-oneware-version.outputs.info }}/OneWareStudio-${{ steps.get-oneware-version.outputs.info }}-arm64.dmg + put ./studio/OneWare.Studio.Desktop.MacOSInstaller/publish/OneWareStudio-${{ steps.get-oneware-version.outputs.info }}-osx-x64.dmg ./cdn.one-ware.com/onewarestudio/${{ steps.get-oneware-version.outputs.info }}/OneWareStudio-${{ steps.get-oneware-version.outputs.info }}-osx-x64.dmg + put ./studio/OneWare.Studio.Desktop.MacOSInstaller/publish/OneWareStudio-${{ steps.get-oneware-version.outputs.info }}-osx-arm64.dmg ./cdn.one-ware.com/onewarestudio/${{ steps.get-oneware-version.outputs.info }}/OneWareStudio-${{ steps.get-oneware-version.outputs.info }}-osx-arm64.dmg put ./out/MacOSDownload-x64.htm ./cdn.one-ware.com/onewarestudio/MacOSDownload-x64.htm put ./out/MacOSDownload-arm64.htm ./cdn.one-ware.com/onewarestudio/MacOSDownload-arm64.htm put ./out/osx-x64.txt ./cdn.one-ware.com/onewarestudio/osx-x64.txt diff --git a/.github/workflows/publish-studio-windows.yml b/.github/workflows/publish-studio-windows.yml index 35a79e32..da73f2a4 100644 --- a/.github/workflows/publish-studio-windows.yml +++ b/.github/workflows/publish-studio-windows.yml @@ -42,9 +42,9 @@ jobs: shell: powershell run: signtool sign /tr http://timestamp.digicert.com /td sha256 /fd sha256 /a ./out/en-us/OneWareStudio.WindowsInstaller.msi - name: Create VersionInfo - run: echo "${{ steps.get-oneware-version.outputs.info }}|https://cdn.one-ware.com/onewarestudio/${{ steps.get-oneware-version.outputs.info }}/OneWareStudio-${{ steps.get-oneware-version.outputs.info }}-x64.msi" > ./out/win-x64.txt + run: echo "${{ steps.get-oneware-version.outputs.info }}|https://github.com/one-ware/OneWare/releases/download/${{ steps.get-oneware-version.outputs.info }}/OneWareStudio-${{ steps.get-oneware-version.outputs.info }}-win-x64.msi" > ./out/win-x64.txt - name: Rename Installer - run: mv ./out/en-us/OneWareStudio.WindowsInstaller.msi ./out/en-us/OneWareStudio-${{ steps.get-oneware-version.outputs.info }}-x64.msi + run: mv ./out/en-us/OneWareStudio.WindowsInstaller.msi ./out/en-us/OneWareStudio-${{ steps.get-oneware-version.outputs.info }}-win-x64.msi - uses: ncipollo/release-action@v1 with: tag: ${{ steps.get-oneware-version.outputs.info }} @@ -62,6 +62,6 @@ jobs: password: ${{ secrets.ONEWARE_FTP }} commands: | mkdir ./cdn.one-ware.com/onewarestudio/${{ steps.get-oneware-version.outputs.info }} - put ./out/en-us/OneWareStudio-${{ steps.get-oneware-version.outputs.info }}-x64.msi ./cdn.one-ware.com/onewarestudio/${{ steps.get-oneware-version.outputs.info }}/OneWareStudio-${{ steps.get-oneware-version.outputs.info }}-x64.msi + put ./out/en-us/OneWareStudio-${{ steps.get-oneware-version.outputs.info }}-win-x64.msi ./cdn.one-ware.com/onewarestudio/${{ steps.get-oneware-version.outputs.info }}/OneWareStudio-${{ steps.get-oneware-version.outputs.info }}-win-x64.msi put ./out/WinDownload.htm ./cdn.one-ware.com/onewarestudio/WinDownload.htm put ./out/win-x64.txt ./cdn.one-ware.com/onewarestudio/win-x64.txt \ No newline at end of file diff --git a/.github/workflows/publish-studio-winget.yml b/.github/workflows/publish-studio-winget.yml index 468a981f..125ecce5 100644 --- a/.github/workflows/publish-studio-winget.yml +++ b/.github/workflows/publish-studio-winget.yml @@ -30,4 +30,4 @@ jobs: xml-file: "./build/props/Base.props" xpath: "//*[local-name()='Project']/*[local-name()='PropertyGroup']/*[local-name()='StudioVersion']" - name: Publish to Winget - run: wingetcreate update OneWare.OneWareStudio -u https://cdn.one-ware.com/onewarestudio/${{ steps.get-oneware-version.outputs.info }}/OneWareStudio-${{ steps.get-oneware-version.outputs.info }}-x64.msi -v ${{ steps.get-oneware-version.outputs.info }} -t ${{ secrets.HENDRIK_PERSONAL_TOKEN }} --submit + run: wingetcreate update OneWare.OneWareStudio -u https://github.com/one-ware/OneWare/releases/download/${{ steps.get-oneware-version.outputs.info }}/OneWareStudio-${{ steps.get-oneware-version.outputs.info }}-win-x64.msi -v ${{ steps.get-oneware-version.outputs.info }} -t ${{ secrets.HENDRIK_PERSONAL_TOKEN }} --submit diff --git a/studio/OneWare.Studio.Desktop.MacOSInstaller/MacOSDownloadTemplate-arm64.htm b/studio/OneWare.Studio.Desktop.MacOSInstaller/MacOSDownloadTemplate-arm64.htm index 1a8e8c02..e2732125 100644 --- a/studio/OneWare.Studio.Desktop.MacOSInstaller/MacOSDownloadTemplate-arm64.htm +++ b/studio/OneWare.Studio.Desktop.MacOSInstaller/MacOSDownloadTemplate-arm64.htm @@ -20,7 +20,7 @@ - ⊚ OneWareStudio-$version$-arm64.dmg diff --git a/studio/OneWare.Studio.Desktop.MacOSInstaller/MacOSDownloadTemplate-x64.htm b/studio/OneWare.Studio.Desktop.MacOSInstaller/MacOSDownloadTemplate-x64.htm index 5be02e6a..809b6627 100644 --- a/studio/OneWare.Studio.Desktop.MacOSInstaller/MacOSDownloadTemplate-x64.htm +++ b/studio/OneWare.Studio.Desktop.MacOSInstaller/MacOSDownloadTemplate-x64.htm @@ -20,7 +20,7 @@ - ⊚ OneWareStudio-$version$-x64.dmg diff --git a/studio/OneWare.Studio.Desktop.WindowsInstaller/WinDownloadTemplate.htm b/studio/OneWare.Studio.Desktop.WindowsInstaller/WinDownloadTemplate.htm index 758b7402..b8d8c389 100644 --- a/studio/OneWare.Studio.Desktop.WindowsInstaller/WinDownloadTemplate.htm +++ b/studio/OneWare.Studio.Desktop.WindowsInstaller/WinDownloadTemplate.htm @@ -20,7 +20,7 @@ - ❖ OneWareStudio-$version$-x64.msi