Merge remote-tracking branch 'origin/main'

one-ware · Jul 31, 2024 · ea76444 · ea76444
2 parents e84289f + 9acaec4
commit ea76444
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 20 deletions.
diff --git a/.github/workflows/publish-studio-linux.yaml b/.github/workflows/publish-studio-linux.yaml
@@ -13,6 +13,8 @@ jobs:
     name: Deploy for Linux
     runs-on: ubuntu-latest
     if: ${{ github.event_name == 'workflow_dispatch' || (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success') }}
+    permissions:
+      contents: write
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -37,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-props-version.outputs.info }}
-          artifacts: "./out/*.tar.gz"
+          tag: ${{ steps.get-oneware-version.outputs.info }}
+          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:
@@ -57,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 }}-linux-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
@@ -13,6 +13,8 @@ jobs:
     name: Deploy for MacOS
     runs-on: macos-latest
     if: ${{ github.event_name == 'workflow_dispatch' || (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success') }}
+    permissions:
+      contents: write
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -40,11 +42,11 @@ 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-props-version.outputs.info }}
+          tag: ${{ steps.get-oneware-version.outputs.info }}
           artifacts: "./studio/OneWare.Studio.Desktop.MacOSInstaller/publish/*.dmg"
           allowUpdates: true
           omitBodyDuringUpdate: True
@@ -58,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:
@@ -69,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
@@ -14,6 +14,8 @@ jobs:
     name: Deploy for Windows
     runs-on: self-hosted
     if: ${{ github.event_name == 'workflow_dispatch' || (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success') }}
+    permissions:
+      contents: write
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -40,12 +42,12 @@ 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-props-version.outputs.info }}
+          tag: ${{ steps.get-oneware-version.outputs.info }}
           artifacts: "./out/en-us/*.msi"
           allowUpdates: true
           omitBodyDuringUpdate: True
@@ -60,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
diff --git 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
@@ -20,7 +20,7 @@
 </head>
 
 <body>
-    <a href="https://cdn.one-ware.com/onewarestudio/$version$/OneWareStudio-$version$-arm64.dmg" 
+    <a href="https://github.com/one-ware/OneWare/releases/download/$version$/OneWareStudio-$version$-osx-arm64.dmg" 
     target="_blank" rel="noopener noreferrer" 
     >
     &#x229A OneWareStudio-$version$-arm64.dmg

diff --git a/studio/OneWare.Studio.Desktop.MacOSInstaller/MacOSDownloadTemplate-x64.htm b/studio/OneWare.Studio.Desktop.MacOSInstaller/MacOSDownloadTemplate-x64.htm
@@ -20,7 +20,7 @@
 </head>
 
 <body>
-    <a href="https://cdn.one-ware.com/onewarestudio/$version$/OneWareStudio-$version$-x64.dmg" 
+    <a href="https://github.com/one-ware/OneWare/releases/download/$version$/OneWareStudio-$version$-osx-x64.dmg" 
     target="_blank" rel="noopener noreferrer" 
     >
     &#x229A OneWareStudio-$version$-x64.dmg

diff --git a/studio/OneWare.Studio.Desktop.WindowsInstaller/WinDownloadTemplate.htm b/studio/OneWare.Studio.Desktop.WindowsInstaller/WinDownloadTemplate.htm
@@ -20,7 +20,7 @@
 </head>
 
 <body>
-    <a href="https://cdn.one-ware.com/onewarestudio/$version$/OneWareStudio-$version$-x64.msi" 
+    <a href="https://github.com/one-ware/OneWare/releases/download/$version$/OneWareStudio-$version$-win-x64.msi" 
     target="_blank" rel="noopener noreferrer" 
     >
     &#x2756 OneWareStudio-$version$-x64.msi

diff --git a/studio/OneWare.Studio.Desktop/com.one_ware.OneWare.metainfo.xml b/studio/OneWare.Studio.Desktop/com.one_ware.OneWare.metainfo.xml
@@ -63,6 +63,7 @@
     </provides>
     <content_rating type="oars-1.1"/>
     <releases>
+        <release version="0.19.2.0" date="2024-07-31" type="stable"/>
         <release version="0.19.1.0" date="2024-07-24" type="stable"/>
         <release version="0.19.0.0" date="2024-07-23" type="stable"/>
         <release version="0.18.5.0" date="2024-07-19" type="stable"/>