Skip to content

Commit

Permalink
Update PHP if ppa:ondrej/php is missing ref: actions/runner-images#6331
Browse files Browse the repository at this point in the history
  • Loading branch information
shivammathur committed Oct 28, 2022
1 parent 388883d commit 5178fac
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 5 deletions.
14 changes: 14 additions & 0 deletions src/scripts/tools/ppa.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
15 changes: 10 additions & 5 deletions src/scripts/unix.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 5178fac

Please sign in to comment.