updated composer.json and composer.lock

[joshdentremont]

Updated composer.json to use advanced search 2.1 instead of 2.0 beta. Also removed a patch for advanced search that we don't need anymore since it's been merged.

Did composer updates as well, to update composer.lock

[joecorall]

Locally on mac and on ubuntu 22 and 24 running into some drush issues. Here is the ubuntu run, which you can see 302's which means the site didn't install (same issue on mac): https://github.com/Islandora-Devops/isle-site-template/actions/runs/11833163634/job/32971286754#step:5:3035

On mac during the setup

git clone [email protected]:islandora-devops/isle-site-template
cd isle-site-template
export ISLANDORA_STARTER_OWNER=joshdentremont
export ISLANDORA_STARTER_REF=heads/main
export ISLANDORA_TAG=main
./tests/init-template-starter.sh

Drush spits this out, which looks like some bash drush uses for something and it's not executing but instead is just printing

# Support bash to support `source` with fallback on $0 if this does not run with bash
# https://stackoverflow.com/a/35006505/6512
selfArg="$BASH_SOURCE"
if [ -z "$selfArg" ]; then
    selfArg="$0"
fi

self=$(realpath $selfArg 2> /dev/null)
if [ -z "$self" ]; then
    self="$selfArg"
fi

dir=$(cd "${self%[/\\]*}" > /dev/null; cd '../drush/drush' && pwd)

if [ -d /proc/cygdrive ]; then
    case $(which php) in
        $(readlink -n /proc/cygdrive)/*)
            # We are in Cygwin using Windows php, so the path must be translated
            dir=$(cygpath -m "$dir");
            ;;
    esac
fi

export COMPOSER_RUNTIME_BIN_DIR="$(cd "${self%[/\\]*}" > /dev/null; pwd)"

# If bash is sourcing this file, we have to source the target as well
bashSource="$BASH_SOURCE"
if [ -n "$bashSource" ]; then
    if [ "$bashSource" != "$0" ]; then
        source "${dir}/drush" "$@"
        return
    fi
fi

"${dir}/drush" "$@"

[joecorall]

This can merge now. The drush fix is in Islandora-Devops/isle-buildkit#355

Ran the CI GitHub Action test manually with that buildkit PR tag and this PR in site template https://github.com/Islandora-Devops/isle-site-template/actions/runs/11833777816