From 67df1501621b26d82371a0af731d7d395f60c05d Mon Sep 17 00:00:00 2001
From: Preston <freetubeapp@protonmail.com>
Date: Sun, 16 Jun 2024 20:37:10 -0400
Subject: [PATCH 01/13] Update flatpak.yml

Update mikefarah/yq to 4.44.1
---
 .github/workflows/flatpak.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
index 9f926e9737198..b346769bf2a00 100644
--- 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@4.0.0-beta1
+      uses: mikefarah/yq@v4.44.1
       with:
         # The Command which should be run
         cmd: yq w -i io.freetubeapp.FreeTube.yml modules[0].sources[0].url 'https://github.com/FreeTubeApp/FreeTube/releases/download/v${{ steps.sub.outputs.result }}-beta/freetube-${{ steps.sub.outputs.result }}-linux-portable-x64.zip'
     - name: Update x64 Hash in yml File
-      uses: mikefarah/yq@4.0.0-beta1
+      uses: mikefarah/yq@v4.44.1
       with:
         # The Command which should be run
         cmd: yq w -i io.freetubeapp.FreeTube.yml modules[0].sources[0].sha256 ${{ env.HASH_X64 }}
     - name: Update ARM File Location in yml File
-      uses: mikefarah/yq@4.0.0-beta1
+      uses: mikefarah/yq@v4.44.1
       with:
         # The Command which should be run
         cmd: yq w -i io.freetubeapp.FreeTube.yml modules[0].sources[1].url 'https://github.com/FreeTubeApp/FreeTube/releases/download/v${{ steps.sub.outputs.result }}-beta/freetube-${{ steps.sub.outputs.result }}-linux-portable-arm64.zip'
     - name: Update ARM Hash in yml File
-      uses: mikefarah/yq@4.0.0-beta1
+      uses: mikefarah/yq@v4.44.1
       with:
         # The Command which should be run
         cmd: yq w -i io.freetubeapp.FreeTube.yml modules[0].sources[1].sha256 ${{ env.HASH_ARM64 }}
@@ -116,9 +116,9 @@ jobs:
 
         # Optional: Disable dirty check and always try to create a commit and push
         skip_dirty_check: true
-    - name: Create PR
-      run: |
-        echo ${{ secrets.FLATHUB_TOKEN }} >> auth.txt
-        gh auth login --with-token < auth.txt
-        rm auth.txt
-        gh pr create --title "Release v${{ steps.sub.outputs.result }}" --body "This is an automated PR for the v${{ steps.sub.outputs.result }} release. This PR will be updated and merged once testing is complete."
+    # - name: Create PR
+      # run: |
+        # echo ${{ secrets.FLATHUB_TOKEN }} >> auth.txt
+        # gh auth login --with-token < auth.txt
+        # rm auth.txt
+        # gh pr create --title "Release v${{ steps.sub.outputs.result }}" --body "This is an automated PR for the v${{ steps.sub.outputs.result }} release. This PR will be updated and merged once testing is complete."

From 6138240b5d103c76c3a05e886bc34691e3ab2bde Mon Sep 17 00:00:00 2001
From: Preston <freetubeapp@protonmail.com>
Date: Sun, 16 Jun 2024 20:46:13 -0400
Subject: [PATCH 02/13] Update flatpak.yml

---
 .github/workflows/flatpak.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
index b346769bf2a00..e97a00aa9dcae 100644
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -116,6 +116,11 @@ jobs:
 
         # Optional: Disable dirty check and always try to create a commit and push
         skip_dirty_check: true
+    - name: Upload Manifest Artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: io.freetubeapp.FreeTube.metainfo
+        path: io.freetubeapp.FreeTube.metainfo.xml
     # - name: Create PR
       # run: |
         # echo ${{ secrets.FLATHUB_TOKEN }} >> auth.txt

From ece50feb379a705b7d2f1013349bbe47f3bf09da Mon Sep 17 00:00:00 2001
From: Preston <freetubeapp@protonmail.com>
Date: Sun, 16 Jun 2024 20:54:27 -0400
Subject: [PATCH 03/13] Update flatpak.yml

---
 .github/workflows/flatpak.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
index e97a00aa9dcae..04954f6659908 100644
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -42,10 +42,10 @@ jobs:
         _input-text: ${{ fromJson(steps.api_results.outputs.result).tag_name }}
         -beta: ''
         v: ''
-    - name: Create Release Branch
-      run: |
-        git checkout -b release-v${{ steps.sub.outputs.result }}
-        git push --set-upstream origin release-v${{ steps.sub.outputs.result }}
+    # - name: Create Release Branch
+      # run: |
+        # git checkout -b release-v${{ steps.sub.outputs.result }}
+        # git push --set-upstream origin release-v${{ steps.sub.outputs.result }}
     - name: Download x64 Release
       uses: fabriciobastian/download-release-asset-action@v1.0.6
       with:

From 70de5c60d74add86e8d11353b6c5910efa03c1f0 Mon Sep 17 00:00:00 2001
From: Preston <freetubeapp@protonmail.com>
Date: Sun, 16 Jun 2024 21:11:21 -0400
Subject: [PATCH 04/13] Update flatpak.yml

---
 .github/workflows/flatpak.yml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
index 04954f6659908..f0245021799bb 100644
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -80,22 +80,22 @@ jobs:
       uses: mikefarah/yq@v4.44.1
       with:
         # The Command which should be run
-        cmd: yq w -i io.freetubeapp.FreeTube.yml modules[0].sources[0].url 'https://github.com/FreeTubeApp/FreeTube/releases/download/v${{ steps.sub.outputs.result }}-beta/freetube-${{ steps.sub.outputs.result }}-linux-portable-x64.zip'
+        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-portable-x64.zip' io.freetubeapp.FreeTube.yml
     - name: Update x64 Hash in yml File
       uses: mikefarah/yq@v4.44.1
       with:
         # The Command which should be run
-        cmd: yq w -i io.freetubeapp.FreeTube.yml modules[0].sources[0].sha256 ${{ env.HASH_X64 }}
+        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.1
       with:
         # The Command which should be run
-        cmd: yq w -i io.freetubeapp.FreeTube.yml modules[0].sources[1].url 'https://github.com/FreeTubeApp/FreeTube/releases/download/v${{ steps.sub.outputs.result }}-beta/freetube-${{ steps.sub.outputs.result }}-linux-portable-arm64.zip'
+        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-portable-arm64.zip' io.freetubeapp.FreeTube.yml
     - name: Update ARM Hash in yml File
       uses: mikefarah/yq@v4.44.1
       with:
         # The Command which should be run
-        cmd: yq w -i io.freetubeapp.FreeTube.yml modules[0].sources[1].sha256 ${{ env.HASH_ARM64 }}
+        cmd: yq -i modules[0].sources[1].sha256 ${{ env.HASH_ARM64 }} io.freetubeapp.FreeTube.yml
     - name: Add Patch Notes to XML File
       run: xmlstarlet ed -L -i /application/releases/release[1] -t elem -n releaseTMP -v "" -i //releaseTMP -t attr -n version -v "${{ steps.sub.outputs.result }} Beta" -i //releaseTMP -t attr -n date -v "${{ env.CURRENT_DATE }}" -s //releaseTMP -t elem -n url -v "" -s //releaseTMP/url -t text -n "" -v "https://github.com/FreeTubeApp/FreeTube/releases/tag/v${{ steps.sub.outputs.result }}-beta" -r //releaseTMP -v "release" io.freetubeapp.FreeTube.metainfo.xml
     - name: Remove Release Files
@@ -121,6 +121,11 @@ jobs:
       with:
         name: io.freetubeapp.FreeTube.metainfo
         path: io.freetubeapp.FreeTube.metainfo.xml
+    - name: Upload YAML Artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: io.freetubeapp.FreeTube.yml
+        path: io.freetubeapp.FreeTube.yml
     # - name: Create PR
       # run: |
         # echo ${{ secrets.FLATHUB_TOKEN }} >> auth.txt

From 94be9b027940527107e869f2cce520dfd59e68ee Mon Sep 17 00:00:00 2001
From: Preston <freetubeapp@protonmail.com>
Date: Sun, 16 Jun 2024 21:14:44 -0400
Subject: [PATCH 05/13] Update flatpak.yml

---
 .github/workflows/flatpak.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
index f0245021799bb..df376e35c0e02 100644
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -80,7 +80,7 @@ jobs:
       uses: mikefarah/yq@v4.44.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-portable-x64.zip' io.freetubeapp.FreeTube.yml
+        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-portable-x64.zip"' io.freetubeapp.FreeTube.yml
     - name: Update x64 Hash in yml File
       uses: mikefarah/yq@v4.44.1
       with:

From af6cc6b2379c0ff3bc75462cf2d491d3028846b2 Mon Sep 17 00:00:00 2001
From: Preston <freetubeapp@protonmail.com>
Date: Sun, 16 Jun 2024 21:16:41 -0400
Subject: [PATCH 06/13] Update flatpak.yml

---
 .github/workflows/flatpak.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
index df376e35c0e02..65f51cbef45f7 100644
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -80,7 +80,7 @@ jobs:
       uses: mikefarah/yq@v4.44.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-portable-x64.zip"' io.freetubeapp.FreeTube.yml
+        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-portable-x64.zip"' io.freetubeapp.FreeTube.yml
     - name: Update x64 Hash in yml File
       uses: mikefarah/yq@v4.44.1
       with:

From 35d369aa2b39ea20b466355c87237d01eaf7fadb Mon Sep 17 00:00:00 2001
From: Preston <freetubeapp@protonmail.com>
Date: Sun, 16 Jun 2024 21:18:47 -0400
Subject: [PATCH 07/13] Update flatpak.yml

---
 .github/workflows/flatpak.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
index 65f51cbef45f7..f932e6c438db2 100644
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -85,17 +85,17 @@ jobs:
       uses: mikefarah/yq@v4.44.1
       with:
         # The Command which should be run
-        cmd: yq -i modules[0].sources[0].sha256 ${{ env.HASH_X64 }} io.freetubeapp.FreeTube.yml
+        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.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-portable-arm64.zip' io.freetubeapp.FreeTube.yml
+        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-portable-arm64.zip"' io.freetubeapp.FreeTube.yml
     - name: Update ARM Hash in yml File
       uses: mikefarah/yq@v4.44.1
       with:
         # The Command which should be run
-        cmd: yq -i modules[0].sources[1].sha256 ${{ env.HASH_ARM64 }} io.freetubeapp.FreeTube.yml
+        cmd: yq -i '.modules[0].sources[1].sha256 = "${{ env.HASH_ARM64 }}"' io.freetubeapp.FreeTube.yml
     - name: Add Patch Notes to XML File
       run: xmlstarlet ed -L -i /application/releases/release[1] -t elem -n releaseTMP -v "" -i //releaseTMP -t attr -n version -v "${{ steps.sub.outputs.result }} Beta" -i //releaseTMP -t attr -n date -v "${{ env.CURRENT_DATE }}" -s //releaseTMP -t elem -n url -v "" -s //releaseTMP/url -t text -n "" -v "https://github.com/FreeTubeApp/FreeTube/releases/tag/v${{ steps.sub.outputs.result }}-beta" -r //releaseTMP -v "release" io.freetubeapp.FreeTube.metainfo.xml
     - name: Remove Release Files

From e6f99e2996daf106ead5da688e7af416b596073f Mon Sep 17 00:00:00 2001
From: Preston <freetubeapp@protonmail.com>
Date: Sun, 16 Jun 2024 21:20:08 -0400
Subject: [PATCH 08/13] Update flatpak.yml

---
 .github/workflows/flatpak.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
index f932e6c438db2..df5ad5d93629c 100644
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -102,20 +102,20 @@ jobs:
       run: |
         rm freetube-${{ steps.sub.outputs.result }}-linux-portable-x64.zip
         rm freetube-${{ steps.sub.outputs.result }}-linux-portable-arm64.zip
-    - name: Commit Files
-      uses: stefanzweifel/git-auto-commit-action@v5
-      with:
+    #- name: Commit Files
+      # uses: stefanzweifel/git-auto-commit-action@v5
+      # with:
         # Optional but recommended
         # Defaults to "Apply automatic changes"
-        commit_message: Update files for v${{ steps.sub.outputs.result }}
-        token: ${{ secrets.FLATHUB_TOKEN }}
+        # commit_message: Update files for v${{ steps.sub.outputs.result }}
+        # token: ${{ secrets.FLATHUB_TOKEN }}
 
         # Optional options appended to `git-commit`
         # See https://git-scm.com/docs/git-commit for a list of available options
-        commit_options: '--no-verify --signoff'
+        # commit_options: '--no-verify --signoff'
 
         # Optional: Disable dirty check and always try to create a commit and push
-        skip_dirty_check: true
+        # skip_dirty_check: true
     - name: Upload Manifest Artifact
       uses: actions/upload-artifact@v4
       with:

From c037cc32875edc08a864212a17d4dc905d76be4f Mon Sep 17 00:00:00 2001
From: Preston <freetubeapp@protonmail.com>
Date: Sun, 16 Jun 2024 21:26:38 -0400
Subject: [PATCH 09/13] Update flatpak.yml

---
 .github/workflows/flatpak.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
index df5ad5d93629c..8b9a11e446701 100644
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -80,7 +80,7 @@ jobs:
       uses: mikefarah/yq@v4.44.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-portable-x64.zip"' io.freetubeapp.FreeTube.yml
+        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 }}-test-x64.zip"' io.freetubeapp.FreeTube.yml
     - name: Update x64 Hash in yml File
       uses: mikefarah/yq@v4.44.1
       with:
@@ -90,14 +90,14 @@ jobs:
       uses: mikefarah/yq@v4.44.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-portable-arm64.zip"' io.freetubeapp.FreeTube.yml
+        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 }}-test-arm64.zip"' io.freetubeapp.FreeTube.yml
     - name: Update ARM Hash in yml File
       uses: mikefarah/yq@v4.44.1
       with:
         # The Command which should be run
         cmd: yq -i '.modules[0].sources[1].sha256 = "${{ env.HASH_ARM64 }}"' io.freetubeapp.FreeTube.yml
     - name: Add Patch Notes to XML File
-      run: xmlstarlet ed -L -i /application/releases/release[1] -t elem -n releaseTMP -v "" -i //releaseTMP -t attr -n version -v "${{ steps.sub.outputs.result }} Beta" -i //releaseTMP -t attr -n date -v "${{ env.CURRENT_DATE }}" -s //releaseTMP -t elem -n url -v "" -s //releaseTMP/url -t text -n "" -v "https://github.com/FreeTubeApp/FreeTube/releases/tag/v${{ steps.sub.outputs.result }}-beta" -r //releaseTMP -v "release" io.freetubeapp.FreeTube.metainfo.xml
+      run: xmlstarlet ed -L -i /application/releases/release[1] -t elem -n releaseTMP -v "" -i //releaseTMP -t attr -n version -v "${{ steps.sub.outputs.result }} Beta" -i //releaseTMP -t attr -n date -v "${{ env.CURRENT_DATE }}" -s //releaseTMP -t elem -n url -v "" -s //releaseTMP/url -t text -n "" -v "https://github.com/FreeTubeApp/FreeTube/releases/tag/v${{ steps.sub.outputs.result }}-test" -r //releaseTMP -v "release" io.freetubeapp.FreeTube.metainfo.xml
     - name: Remove Release Files
       run: |
         rm freetube-${{ steps.sub.outputs.result }}-linux-portable-x64.zip

From a89ea0de6eae95aa7a03f74a4f8b792880a515a4 Mon Sep 17 00:00:00 2001
From: Preston <freetubeapp@protonmail.com>
Date: Sun, 16 Jun 2024 21:32:38 -0400
Subject: [PATCH 10/13] Update flatpak.yml

---
 .github/workflows/flatpak.yml | 36 +++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
index 8b9a11e446701..598b52e18cdde 100644
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -42,10 +42,10 @@ jobs:
         _input-text: ${{ fromJson(steps.api_results.outputs.result).tag_name }}
         -beta: ''
         v: ''
-    # - name: Create Release Branch
-      # run: |
-        # git checkout -b release-v${{ steps.sub.outputs.result }}
-        # git push --set-upstream origin release-v${{ steps.sub.outputs.result }}
+    - name: Create Release Branch
+      run: |
+        git checkout -b release-v${{ steps.sub.outputs.result }}
+        git push --set-upstream origin release-v${{ steps.sub.outputs.result }}
     - name: Download x64 Release
       uses: fabriciobastian/download-release-asset-action@v1.0.6
       with:
@@ -97,25 +97,25 @@ jobs:
         # The Command which should be run
         cmd: yq -i '.modules[0].sources[1].sha256 = "${{ env.HASH_ARM64 }}"' io.freetubeapp.FreeTube.yml
     - name: Add Patch Notes to XML File
-      run: xmlstarlet ed -L -i /application/releases/release[1] -t elem -n releaseTMP -v "" -i //releaseTMP -t attr -n version -v "${{ steps.sub.outputs.result }} Beta" -i //releaseTMP -t attr -n date -v "${{ env.CURRENT_DATE }}" -s //releaseTMP -t elem -n url -v "" -s //releaseTMP/url -t text -n "" -v "https://github.com/FreeTubeApp/FreeTube/releases/tag/v${{ steps.sub.outputs.result }}-test" -r //releaseTMP -v "release" io.freetubeapp.FreeTube.metainfo.xml
+      run: xmlstarlet ed -L -i /application/releases/release[1] -t elem -n releaseTMP -v "" -i //releaseTMP -t attr -n version -v "${{ steps.sub.outputs.result }} Beta" -i //releaseTMP -t attr -n date -v "${{ env.CURRENT_DATE }}" -s //releaseTMP -t elem -n url -v "" -s //releaseTMP/url -t text -n "" -v "https://github.com/FreeTubeApp/FreeTube/releases/tag/v${{ steps.sub.outputs.result }}-beta" -r //releaseTMP -v "release" io.freetubeapp.FreeTube.metainfo.xml
     - name: Remove Release Files
       run: |
         rm freetube-${{ steps.sub.outputs.result }}-linux-portable-x64.zip
         rm freetube-${{ steps.sub.outputs.result }}-linux-portable-arm64.zip
-    #- name: Commit Files
-      # uses: stefanzweifel/git-auto-commit-action@v5
-      # with:
+    - name: Commit Files
+      uses: stefanzweifel/git-auto-commit-action@v5
+      with:
         # Optional but recommended
         # Defaults to "Apply automatic changes"
-        # commit_message: Update files for v${{ steps.sub.outputs.result }}
-        # token: ${{ secrets.FLATHUB_TOKEN }}
+        commit_message: Update files for v${{ steps.sub.outputs.result }}
+        token: ${{ secrets.FLATHUB_TOKEN }}
 
         # Optional options appended to `git-commit`
         # See https://git-scm.com/docs/git-commit for a list of available options
-        # commit_options: '--no-verify --signoff'
+        commit_options: '--no-verify --signoff'
 
         # Optional: Disable dirty check and always try to create a commit and push
-        # skip_dirty_check: true
+        skip_dirty_check: true
     - name: Upload Manifest Artifact
       uses: actions/upload-artifact@v4
       with:
@@ -126,9 +126,9 @@ jobs:
       with:
         name: io.freetubeapp.FreeTube.yml
         path: io.freetubeapp.FreeTube.yml
-    # - name: Create PR
-      # run: |
-        # echo ${{ secrets.FLATHUB_TOKEN }} >> auth.txt
-        # gh auth login --with-token < auth.txt
-        # rm auth.txt
-        # gh pr create --title "Release v${{ steps.sub.outputs.result }}" --body "This is an automated PR for the v${{ steps.sub.outputs.result }} release. This PR will be updated and merged once testing is complete."
+    - name: Create PR
+      run: |
+        echo ${{ secrets.FLATHUB_TOKEN }} >> auth.txt
+        gh auth login --with-token < auth.txt
+        rm auth.txt
+        gh pr create --title "Release v${{ steps.sub.outputs.result }}" --body "This is an automated PR for the v${{ steps.sub.outputs.result }} release. This PR will be updated and merged once testing is complete."

From 83af7cac5e6af9a5f738c692ac1933e8132ea86a Mon Sep 17 00:00:00 2001
From: Preston <freetubeapp@protonmail.com>
Date: Sun, 16 Jun 2024 21:33:28 -0400
Subject: [PATCH 11/13] Update flatpak.yml

---
 .github/workflows/flatpak.yml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
index 598b52e18cdde..dc2e06aabf688 100644
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -116,16 +116,6 @@ jobs:
 
         # Optional: Disable dirty check and always try to create a commit and push
         skip_dirty_check: true
-    - name: Upload Manifest Artifact
-      uses: actions/upload-artifact@v4
-      with:
-        name: io.freetubeapp.FreeTube.metainfo
-        path: io.freetubeapp.FreeTube.metainfo.xml
-    - name: Upload YAML Artifact
-      uses: actions/upload-artifact@v4
-      with:
-        name: io.freetubeapp.FreeTube.yml
-        path: io.freetubeapp.FreeTube.yml
     - name: Create PR
       run: |
         echo ${{ secrets.FLATHUB_TOKEN }} >> auth.txt

From 2bc7c9b63ff85da38a7142791dc0dd0306061229 Mon Sep 17 00:00:00 2001
From: Preston <freetubeapp@protonmail.com>
Date: Sun, 16 Jun 2024 21:33:54 -0400
Subject: [PATCH 12/13] Update flatpak.yml

---
 .github/workflows/flatpak.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
index dc2e06aabf688..c5f945c019ced 100644
--- 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.1
+      uses: mikefarah/yq@v4.44.2
       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 }}-test-x64.zip"' io.freetubeapp.FreeTube.yml
     - name: Update x64 Hash in yml File
-      uses: mikefarah/yq@v4.44.1
+      uses: mikefarah/yq@v4.44.2
       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.1
+      uses: mikefarah/yq@v4.44.2
       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 }}-test-arm64.zip"' io.freetubeapp.FreeTube.yml
     - name: Update ARM Hash in yml File
-      uses: mikefarah/yq@v4.44.1
+      uses: mikefarah/yq@v4.44.2
       with:
         # The Command which should be run
         cmd: yq -i '.modules[0].sources[1].sha256 = "${{ env.HASH_ARM64 }}"' io.freetubeapp.FreeTube.yml

From fd0b52f442b5c39158d51d66e71a0a961cfc8939 Mon Sep 17 00:00:00 2001
From: Preston <freetubeapp@protonmail.com>
Date: Sun, 16 Jun 2024 21:35:08 -0400
Subject: [PATCH 13/13] Update flatpak.yml

---
 .github/workflows/flatpak.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
index c5f945c019ced..dcb395c41cd27 100644
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -80,7 +80,7 @@ jobs:
       uses: mikefarah/yq@v4.44.2
       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 }}-test-x64.zip"' io.freetubeapp.FreeTube.yml
+        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-portable-x64.zip"' io.freetubeapp.FreeTube.yml
     - name: Update x64 Hash in yml File
       uses: mikefarah/yq@v4.44.2
       with:
@@ -90,7 +90,7 @@ jobs:
       uses: mikefarah/yq@v4.44.2
       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 }}-test-arm64.zip"' io.freetubeapp.FreeTube.yml
+        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-portable-arm64.zip"' io.freetubeapp.FreeTube.yml
     - name: Update ARM Hash in yml File
       uses: mikefarah/yq@v4.44.2
       with: