diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index 1171a8b7..957d036a 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -42,15 +42,7 @@ jobs: run: "automation_tools/install_dependencies.sh" - name: Generate cooker build ID - run: | - word1=$(shuf -n 1 ${GITHUB_WORKSPACE}/automation_tools/codename_wordlist.txt) - capitalized_word1="$(tr '[:lower:]' '[:upper:]' <<< ${word1:0:1})${word1:1}" - word2=$(shuf -n 1 ${GITHUB_WORKSPACE}/automation_tools/codename_wordlist.txt) - capitalized_word2="$(tr '[:lower:]' '[:upper:]' <<< ${word2:0:1})${word2:1}" - result=$capitalized_word1$capitalized_word2 - echo $result > ${GITHUB_WORKSPACE}/buildid - echo "buildid=$result" >> $GITHUB_ENV - echo "VersionID is $result" + run: "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/cooker_build_id.sh" - name: Run pre-build automation tasks run : "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh" diff --git a/.gitignore b/.gitignore index 60388609..f7355c0a 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,7 @@ backup tmp .godot rd-submodules/es-de/patches-tmp* +.local/ # Python # ########## diff --git a/automation_tools/cooker_build_id.sh b/automation_tools/cooker_build_id.sh new file mode 100644 index 00000000..ff4c8119 --- /dev/null +++ b/automation_tools/cooker_build_id.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +word1=$(shuf -n 1 ${GITHUB_WORKSPACE}/automation_tools/codename_wordlist.txt) +capitalized_word1="$(tr '[:lower:]' '[:upper:]' <<< ${word1:0:1})${word1:1}" +word2=$(shuf -n 1 ${GITHUB_WORKSPACE}/automation_tools/codename_wordlist.txt) +capitalized_word2="$(tr '[:lower:]' '[:upper:]' <<< ${word2:0:1})${word2:1}" +result=$capitalized_word1$capitalized_word2 +echo $result > ${GITHUB_WORKSPACE}/buildid +echo "buildid=$result" >> $GITHUB_ENV +echo "VersionID is $result" \ No newline at end of file diff --git a/automation_tools/flatpak_build_download_only.sh b/automation_tools/flatpak_build_download_only.sh index 122b244f..31f006d0 100755 --- a/automation_tools/flatpak_build_download_only.sh +++ b/automation_tools/flatpak_build_download_only.sh @@ -6,7 +6,7 @@ git config --global protocol.file.allow always if [[ "${GITHUB_REF##*/}" == "main" ]]; then BUNDLE_NAME="RetroDECK.flatpak" - FOLDER=retrodeck-flatpak-cooker + FOLDER=retrodeck-flatpak else BUNDLE_NAME="RetroDECK-cooker.flatpak" FOLDER=retrodeck-flatpak-cooker diff --git a/build-local.sh b/build-local.sh new file mode 100755 index 00000000..c1e218c5 --- /dev/null +++ b/build-local.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +export GITHUB_WORKSPACE="." + +automation_tools/install_dependencies.sh +automation_tools/cooker_build_id.sh +automation_tools/pre_build_automation.sh +automation_tools/cooker_flatpak_portal_add.sh +automation_tools/appdata_management.sh +automation_tools/flatpak_build_download_only.sh +automation_tools/flatpak_build_only.sh +automation_tools/flatpak_build_bundle.sh +