diff --git a/src/scripts/tools/ppa.sh b/src/scripts/tools/ppa.sh index 47e245382..acc8ee271 100644 --- a/src/scripts/tools/ppa.sh +++ b/src/scripts/tools/ppa.sh @@ -140,6 +140,20 @@ add_list() { return 0; } +# Function to check if a PPA exists +check_ppa() { + ppa=$1 + ppa_url=${2:-"$lp_ppa/$ppa/ubuntu"} + package_dist=${3:-"$VERSION_CODENAME"} + branches=${4:-main} + ppa_search="deb .*$ppa_url $package_dist .*$branches" + if check_lists "$ppa" "$ppa_search"; then + return 0; + else + return 1; + fi +} + # Function to remove a PPA. remove_list() { ppa=${1-ondrej/php} diff --git a/src/scripts/unix.sh b/src/scripts/unix.sh index d8cc31401..fdb3c974f 100644 --- a/src/scripts/unix.sh +++ b/src/scripts/unix.sh @@ -56,15 +56,20 @@ read_env() { [[ -z "${ImageOS}" && -z "${ImageVersion}" ]] && _runner=self-hosted || _runner=github runner="${runner:-${RUNNER:-$_runner}}" - export fail_fast - export runner - export update - export ts - if [[ "$runner" = "github" && $_runner = "self-hosted" ]]; then fail_fast=true add_log "$cross" "Runner" "Runner set as github in self-hosted environment" fi + + # Set Update to true if the ubuntu github image does not have PHP PPA. + if [[ "$runner" = "github" && "${ImageOS}" =~ ubuntu.* ]]; then + check_ppa ondrej/php || update=true + fi + + export fail_fast + export runner + export update + export ts } # Function to download a file using cURL.