Browse Source

CI: Bump Flatpak actions to v6.1

Sadly, v6 had an issue where it pushed the build to the `master`
branch regardless of the branch specified in the action config.
This was fixed in v6.1, so let's use that, and publish further
releases on the right branch.
Georges Basile Stavracas Neto 2 years ago
parent
commit
6e25b3198a
2 changed files with 4 additions and 4 deletions
  1. 3 3
      .github/workflows/flatpak.yml
  2. 1 1
      .github/workflows/main.yml

+ 3 - 3
.github/workflows/flatpak.yml

@@ -80,7 +80,7 @@ jobs:
           echo "cache_hit=$CACHE_HIT" >> $GITHUB_OUTPUT
           echo "cache_hit=$CACHE_HIT" >> $GITHUB_OUTPUT
 
 
       - name: Build Flatpak Manifest
       - name: Build Flatpak Manifest
-        uses: flatpak/flatpak-github-actions/flatpak-builder@v6
+        uses: flatpak/flatpak-github-actions/flatpak-builder@v6.1
         with:
         with:
           bundle: obs-studio-${{ steps.setup.outputs.git_hash }}.flatpak
           bundle: obs-studio-${{ steps.setup.outputs.git_hash }}.flatpak
           manifest-path: CI/flatpak/com.obsproject.Studio.json
           manifest-path: CI/flatpak/com.obsproject.Studio.json
@@ -107,7 +107,7 @@ jobs:
           ostree commit --repo=repo --canonical-permissions --branch=screenshots/x86_64 flatpak_app/screenshots
           ostree commit --repo=repo --canonical-permissions --branch=screenshots/x86_64 flatpak_app/screenshots
 
 
       - name: Publish to Flathub Beta
       - name: Publish to Flathub Beta
-        uses: flatpak/flatpak-github-actions/flat-manager@v6
+        uses: flatpak/flatpak-github-actions/flat-manager@v6.1
         if: matrix.branch == 'beta'
         if: matrix.branch == 'beta'
         with:
         with:
           flat-manager-url: https://hub.flathub.org/
           flat-manager-url: https://hub.flathub.org/
@@ -115,7 +115,7 @@ jobs:
           token: ${{ secrets.FLATHUB_BETA_TOKEN }}
           token: ${{ secrets.FLATHUB_BETA_TOKEN }}
 
 
       - name: Publish to Flathub
       - name: Publish to Flathub
-        uses: flatpak/flatpak-github-actions/flat-manager@v6
+        uses: flatpak/flatpak-github-actions/flat-manager@v6.1
         if: matrix.branch == 'stable'
         if: matrix.branch == 'stable'
         with:
         with:
           flat-manager-url: https://hub.flathub.org/
           flat-manager-url: https://hub.flathub.org/

+ 1 - 1
.github/workflows/main.yml

@@ -376,7 +376,7 @@ jobs:
           echo "cache_hit=$CACHE_HIT" >> $GITHUB_OUTPUT
           echo "cache_hit=$CACHE_HIT" >> $GITHUB_OUTPUT
 
 
       - name: Build Flatpak Manifest
       - name: Build Flatpak Manifest
-        uses: flatpak/flatpak-github-actions/flatpak-builder@v6
+        uses: flatpak/flatpak-github-actions/flatpak-builder@v6.1
         with:
         with:
           build-bundle: ${{ fromJSON(needs.config.outputs.create_artifacts) }}
           build-bundle: ${{ fromJSON(needs.config.outputs.create_artifacts) }}
           bundle: obs-studio-flatpak-${{ steps.setup.outputs.git_hash }}.flatpak
           bundle: obs-studio-flatpak-${{ steps.setup.outputs.git_hash }}.flatpak