Merge remote-tracking branch 'upstream/cooker-0.6.0b' into cooker-configurator

This commit is contained in:
icenine451 2022-11-17 13:36:04 -05:00
commit bbdea78de5
2 changed files with 8 additions and 3 deletions

View file

@ -46,7 +46,7 @@ jobs:
- name: Build flatpak
run: |
git config --global protocol.allow always
git config --global protocol.file.allow always
flatpak-builder --user --force-clean --install-deps-from=flathub --install-deps-from=flathub-beta --repo=${GITHUB_WORKSPACE}/local ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml
- name: Create Artifact for flathub
@ -86,4 +86,4 @@ jobs:
with:
name: retrodeck-flatpak
path: RetroDECK.flatpak
continue-on-error: true
continue-on-error: true

View file

@ -538,6 +538,11 @@ modules:
# PCSX2 - END
- name: debug
buildsystem: simple
build-commands:
- whoami
# Dolphin - START
# https://github.com/flathub/org.DolphinEmu.dolphin-emu
# WHEN UPADTING: remember to update rd-submodules/dolphin contents
@ -608,7 +613,7 @@ modules:
- sed -i -e 's/"2048"/"512"/g' /app/share/icons/hicolor/scalable/apps/dolphin-emu.svg
sources:
- type: git
url: https://github.com/dolphin-emu/dolphin.git
url: ssh://git@github.com/dolphin-emu/dolphin.git
commit: 48c9c224cf9f82f0f9f2690b7cc6283d7448480c
x-checker-data:
type: json