starred/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-25 17:02:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

build-aux,CI: Split Flatpak manifest in multiple files

Browse Source 
Also moves Flatpak manifest to build-aux folder
This commit is contained in:
tytan652
2023-05-13 18:26:17 -07:00
committed by Jim
parent 2ab326d2cd
commit 904fe87f83
25 changed files with 563 additions and 520 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/flatpak.yml
+2 -2
View File
@@ -65,7 +65,7 @@ jobs:
id: setup
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
CACHE_KEY: flatpak-builder-${{ hashFiles('CI/flatpak/com.obsproject.Studio.json') }}
CACHE_KEY: flatpak-builder-${{ hashFiles('build-aux/**/*.json') }}
run: |
dnf install -y -q gh
gh extension install actions/gh-actions-cache
@@ -83,7 +83,7 @@ jobs:
uses: flatpak/flatpak-github-actions/flatpak-builder@v6.1
with:
bundle: obs-studio-${{ steps.setup.outputs.git_hash }}.flatpak
manifest-path: CI/flatpak/com.obsproject.Studio.json
manifest-path: build-aux/com.obsproject.Studio.json
cache: ${{ fromJSON(steps.setup.outputs.cache_hit) }}
cache-key: ${{ steps.setup.outputs.cache_key }}
mirror-screenshots-url: https://dl.flathub.org/repo/screenshots
.github/workflows/main.yml
+2 -2
View File
@@ -374,7 +374,7 @@ jobs:
id: setup
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
CACHE_KEY: flatpak-builder-${{ hashFiles('CI/flatpak/com.obsproject.Studio.json') }}
CACHE_KEY: flatpak-builder-${{ hashFiles('build-aux/**/*.json') }}
run: |
dnf install -y -q gh
gh extension install actions/gh-actions-cache
@@ -393,7 +393,7 @@ jobs:
with:
build-bundle: ${{ fromJSON(needs.config.outputs.create_artifacts) }}
bundle: obs-studio-flatpak-${{ steps.setup.outputs.git_hash }}.flatpak
manifest-path: CI/flatpak/com.obsproject.Studio.json
manifest-path: build-aux/com.obsproject.Studio.json
cache: ${{ fromJSON(steps.setup.outputs.cache_hit) || (github.event_name == 'push' && github.ref == 'refs/heads/master') }}
restore-cache: ${{ fromJSON(steps.setup.outputs.cache_hit) }}
cache-key: ${{ steps.setup.outputs.cache_key }}