Merge remote-tracking branch 'upstream/development' into development

MarmadileManteater · Jan 28, 2025 · 52fd574 · 52fd574
2 parents 6f74a39 + fb098b3
commit 52fd574
Show file tree

Hide file tree

Showing 151 changed files with 3,615 additions and 2,567 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -255,12 +255,12 @@ jobs:
         name: freetube-${{ steps.versionNumber.outputs.result }}-setup-x64.exe
         path: build/freetube Setup ${{ steps.versionNumber.outputs.result }}.exe
 
-    - name: Upload Windows arm64 .exe Artifact
+    - name: Upload Windows x64 Portable Artifact
       uses: actions/upload-artifact@v4
-      if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-arm64')
+      if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-x64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-setup-arm64.exe
-        path: build/freetube Setup ${{ steps.versionNumber.outputs.result }}.exe
+        name: freetube-${{ steps.versionNumber.outputs.result }}-win-x64-portable.exe
+        path: build/freetube ${{ steps.versionNumber.outputs.result }}.exe
 
     - name: Upload Windows x64 .zip Artifact
       uses: actions/upload-artifact@v4
@@ -276,33 +276,33 @@ jobs:
         name: freetube-${{ steps.versionNumber.outputs.result }}-win-x64-portable.7z
         path: build/freetube-${{ steps.versionNumber.outputs.result }}-win.7z
 
-    - name: Upload Windows arm64 .zip Artifact
+    - name: Upload Windows arm64 .exe Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-arm64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-win-arm64-portable.zip
-        path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64-win.zip
+        name: freetube-${{ steps.versionNumber.outputs.result }}-setup-arm64.exe
+        path: build/freetube Setup ${{ steps.versionNumber.outputs.result }}.exe
 
-    - name: Upload Windows arm64 .7z Artifact
+    - name: Upload Windows arm64 Portable Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-arm64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-win-arm64-portable.7z
-        path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64-win.7z
+        name: freetube-${{ steps.versionNumber.outputs.result }}-win-arm64-portable.exe
+        path: build/freetube ${{ steps.versionNumber.outputs.result }}.exe
 
-    - name: Upload Windows x64 Portable Artifact
+    - name: Upload Windows arm64 .zip Artifact
       uses: actions/upload-artifact@v4
-      if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-x64')
+      if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-arm64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-win-x64-portable.exe
-        path: build/freetube ${{ steps.versionNumber.outputs.result }}.exe
+        name: freetube-${{ steps.versionNumber.outputs.result }}-win-arm64-portable.zip
+        path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64-win.zip
 
-    - name: Upload Windows arm64 Portable Artifact
+    - name: Upload Windows arm64 .7z Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-arm64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-win-arm64-portable.exe
-        path: build/freetube ${{ steps.versionNumber.outputs.result }}.exe
+        name: freetube-${{ steps.versionNumber.outputs.result }}-win-arm64-portable.7z
+        path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64-win.7z
 
     - name: Upload Mac x64 .dmg Artifact
       uses: actions/upload-artifact@v4
@@ -311,13 +311,6 @@ jobs:
         name: freetube-${{ steps.versionNumber.outputs.result }}-mac-x64.dmg
         path: build/freetube-${{ steps.versionNumber.outputs.result }}.dmg
 
-    - name: Upload Mac arm64 .dmg Artifact
-      uses: actions/upload-artifact@v4
-      if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
-      with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.dmg
-        path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64.dmg
-
     - name: Upload Mac x64 .zip Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-x64')
@@ -332,6 +325,13 @@ jobs:
         name: freetube-${{ steps.versionNumber.outputs.result }}-mac-x64.7z
         path: build/freetube-${{ steps.versionNumber.outputs.result }}-mac.7z
 
+    - name: Upload Mac arm64 .dmg Artifact
+      uses: actions/upload-artifact@v4
+      if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
+      with:
+        name: freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.dmg
+        path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64.dmg
+
     - name: Upload Mac arm64 .zip Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')

diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
@@ -77,22 +77,22 @@ jobs:
         date +"%Y-%m-%d" >> $GITHUB_ENV
         echo 'EOF' >> $GITHUB_ENV
     - name: Update x64 File Location in yml File
-      uses: mikefarah/yq@v4.44.6
+      uses: mikefarah/yq@v4.45.1
       with:
         # The Command which should be run
         cmd: yq -i '.modules[0].sources[0].url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${{ steps.sub.outputs.result }}-beta/freetube-${{ steps.sub.outputs.result }}-linux-x64-portable.zip"' io.freetubeapp.FreeTube.yml
     - name: Update x64 Hash in yml File
-      uses: mikefarah/yq@v4.44.6
+      uses: mikefarah/yq@v4.45.1
       with:
         # The Command which should be run
         cmd: yq -i '.modules[0].sources[0].sha256 = "${{ env.HASH_X64 }}"' io.freetubeapp.FreeTube.yml
     - name: Update ARM File Location in yml File
-      uses: mikefarah/yq@v4.44.6
+      uses: mikefarah/yq@v4.45.1
       with:
         # The Command which should be run
         cmd: yq -i '.modules[0].sources[1].url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${{ steps.sub.outputs.result }}-beta/freetube-${{ steps.sub.outputs.result }}-linux-arm64-portable.zip"' io.freetubeapp.FreeTube.yml
     - name: Update ARM Hash in yml File
-      uses: mikefarah/yq@v4.44.6
+      uses: mikefarah/yq@v4.45.1
       with:
         # The Command which should be run
         cmd: yq -i '.modules[0].sources[1].sha256 = "${{ env.HASH_ARM64 }}"' io.freetubeapp.FreeTube.yml