Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI/Flatpak: Validate build before pushing #10191

Merged
merged 2 commits into from
Oct 28, 2023
Merged

CI/Flatpak: Validate build before pushing #10191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c22d941
CI/Flatpak: Use socket=x11 instead of fallback
stenzek Oct 28, 2023
257e10c
CI/Flatpak: Validate build before pushing
stenzek Oct 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .github/workflows/linux_build_flatpak.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,10 @@ jobs:
cat .github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.metainfo.xml
flatpak run org.freedesktop.appstream-glib validate .github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.metainfo.xml

- name: Validate manifest
run: |
flatpak run --command=flatpak-builder-lint org.flatpak.Builder manifest .github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.json

- name: Build Flatpak
uses: flatpak/flatpak-github-actions/[email protected]
with:
Expand All @@ -103,6 +107,14 @@ jobs:
run: |
ostree commit --repo=repo --canonical-permissions --branch=screenshots/x86_64 flatpak_app/screenshots

- name: Validate build directory
run: |
flatpak run --command=flatpak-builder-lint org.flatpak.Builder builddir flatpak_app

- name: Validate repo
run: |
flatpak run --command=flatpak-builder-lint org.flatpak.Builder repo repo

- name: Push to Flathub beta
if: inputs.publish == true && inputs.branch == 'beta'
uses: flatpak/flatpak-github-actions/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"--device=all",
"--share=network",
"--share=ipc",
"--socket=fallback-x11",
"--socket=x11",
"--socket=pulseaudio",
"--talk-name=org.freedesktop.ScreenSaver",
"--env=QT_QPA_PLATFORM=xcb"
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/scripts/linux/install-packages-flatpak.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub
echo "Will install the following packages for building - ${FLATPAK_PACKAGES[*]}"
retry_command sudo flatpak -y install "${FLATPAK_PACKAGES[@]}"

echo "Installing Flatpak Builder"
retry_command sudo flatpak -y install flathub org.flatpak.builder

echo "Downloading flat-manager-client"
mkdir -p "$FLAT_MANAGER_CLIENT_DIR"
pushd "$FLAT_MANAGER_CLIENT_DIR"
Expand Down