BUILDER: added the availability to build offline, fixes

This commit is contained in:
XargonWan 2023-11-30 17:04:21 +01:00
parent 9fcf8ad307
commit 31b07151ed
7 changed files with 18 additions and 11 deletions

View file

@ -68,7 +68,7 @@ jobs:
- name: Buld part 1 - Until melonds - name: Buld part 1 - Until melonds
run: | run: |
sudo flatpak-builder --build-only --stop-at=melonds --user --force-clean --repo=${GITHUB_WORKSPACE}/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml sudo flatpak-builder --build-only --stop-at=melonds --user --force-clean --repo=${GITHUB_WORKSPACE}/.local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml
- name: Compress cache - name: Compress cache
run: | run: |
@ -140,8 +140,8 @@ jobs:
- name: Create Bundle - name: Create Bundle
run: | run: |
sudo flatpak-builder --user --force-clean --repo=${GITHUB_WORKSPACE}/local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml sudo flatpak-builder --user --force-clean --repo=${GITHUB_WORKSPACE}/.local retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml
sudo flatpak build-bundle $GITHUB_WORKSPACE/local RetroDECK.flatpak net.retrodeck.retrodeck sudo flatpak build-bundle $GITHUB_WORKSPACE/.local RetroDECK.flatpak net.retrodeck.retrodeck
- name: Get date for artifacts - name: Get date for artifacts
id: date id: date

View file

@ -69,7 +69,7 @@ jobs:
- name: Buld part 1 - Until melonds - name: Buld part 1 - Until melonds
run: | run: |
sudo flatpak-builder --build-only --stop-at=melonds --user --force-clean --repo=${GITHUB_WORKSPACE}/local retrodeck-flatpak-main net.retrodeck.retrodeck.yml sudo flatpak-builder --build-only --stop-at=melonds --user --force-clean --repo=${GITHUB_WORKSPACE}/.local retrodeck-flatpak-main net.retrodeck.retrodeck.yml
- name: Compress cache - name: Compress cache
run: | run: |
@ -141,8 +141,8 @@ jobs:
- name: Create Bundle - name: Create Bundle
run: | run: |
sudo flatpak-builder --user --force-clean --repo=${GITHUB_WORKSPACE}/local retrodeck-flatpak-main net.retrodeck.retrodeck.yml sudo flatpak-builder --user --force-clean --repo=${GITHUB_WORKSPACE}/.local retrodeck-flatpak-main net.retrodeck.retrodeck.yml
sudo flatpak build-bundle $GITHUB_WORKSPACE/local RetroDECK.flatpak net.retrodeck.retrodeck sudo flatpak build-bundle $GITHUB_WORKSPACE/.local RetroDECK.flatpak net.retrodeck.retrodeck
- name: Read version from version file - name: Read version from version file
id: version id: version

1
.gitignore vendored
View file

@ -19,6 +19,7 @@ tmp
.godot .godot
rd-submodules/es-de/patches-tmp* rd-submodules/es-de/patches-tmp*
.local/ .local/
buildid
# Python # # Python #
########## ##########

View file

@ -3,7 +3,7 @@
# This is building the bundle RetroDECK.flatpak after the download and build steps are done # This is building the bundle RetroDECK.flatpak after the download and build steps are done
if [ "${GITHUB_REF##*/}" = "main" ]; then if [ "${GITHUB_REF##*/}" = "main" ]; then
flatpak build-bundle ${GITHUB_WORKSPACE}/local RetroDECK.flatpak net.retrodeck.retrodeck flatpak build-bundle ${GITHUB_WORKSPACE}/.local RetroDECK.flatpak net.retrodeck.retrodeck
else else
flatpak build-bundle ${GITHUB_WORKSPACE}/local RetroDECK-cooker.flatpak net.retrodeck.retrodeck flatpak build-bundle ${GITHUB_WORKSPACE}/.local RetroDECK-cooker.flatpak net.retrodeck.retrodeck
fi fi

View file

@ -17,7 +17,7 @@ mkdir -vp "${GITHUB_WORKSPACE}"/{local,retrodeck-flatpak-cooker}
flatpak-builder --user --force-clean \ flatpak-builder --user --force-clean \
--install-deps-from=flathub \ --install-deps-from=flathub \
--install-deps-from=flathub-beta \ --install-deps-from=flathub-beta \
--repo="${GITHUB_WORKSPACE}/local" \ --repo="${GITHUB_WORKSPACE}/.local" \
--download-only \ --download-only \
"${GITHUB_WORKSPACE}/${FOLDER}" \ "${GITHUB_WORKSPACE}/${FOLDER}" \
net.retrodeck.retrodeck.yml net.retrodeck.retrodeck.yml

View file

@ -12,13 +12,13 @@ else
FOLDER=retrodeck-flatpak-cooker FOLDER=retrodeck-flatpak-cooker
fi fi
mkdir -vp ${GITHUB_WORKSPACE}/local mkdir -vp ${GITHUB_WORKSPACE}/.local
mkdir -vp ${GITHUB_WORKSPACE}/"$FOLDER" mkdir -vp ${GITHUB_WORKSPACE}/"$FOLDER"
flatpak-builder --user --force-clean \ flatpak-builder --user --force-clean \
--install-deps-from=flathub \ --install-deps-from=flathub \
--install-deps-from=flathub-beta \ --install-deps-from=flathub-beta \
--repo=${GITHUB_WORKSPACE}/local \ --repo=${GITHUB_WORKSPACE}/.local \
--disable-download \ --disable-download \
${GITHUB_WORKSPACE}/"$FOLDER" \ ${GITHUB_WORKSPACE}/"$FOLDER" \
net.retrodeck.retrodeck.yml net.retrodeck.retrodeck.yml

View file

@ -1,6 +1,8 @@
#!/bin/bash #!/bin/bash
export GITHUB_WORKSPACE="." export GITHUB_WORKSPACE="."
cp net.retrodeck.retrodeck.appdata.xml net.retrodeck.retrodeck.appdata.xml.bak
cp net.retrodeck.retrodeck.yml net.retrodeck.retrodeck.yml.bak
automation_tools/install_dependencies.sh automation_tools/install_dependencies.sh
automation_tools/cooker_build_id.sh automation_tools/cooker_build_id.sh
@ -11,3 +13,7 @@ automation_tools/flatpak_build_download_only.sh
automation_tools/flatpak_build_only.sh automation_tools/flatpak_build_only.sh
automation_tools/flatpak_build_bundle.sh automation_tools/flatpak_build_bundle.sh
rm -f net.retrodeck.retrodeck.appdata.xml
rm -f net.retrodeck.retrodeck.yml
cp net.retrodeck.retrodeck.appdata.xml.bak net.retrodeck.retrodeck.appdata.xml
cp net.retrodeck.retrodeck.yml.bak net.retrodeck.retrodeck.yml