diff --git a/composer.json b/composer.json index ee07431..fd9c235 100644 --- a/composer.json +++ b/composer.json @@ -52,9 +52,7 @@ "laminas/laminas-log": "^2.11", "laminas/laminas-i18n": "^2.9", "symfony/console": "^5.0", - "laminas/laminas-dependency-plugin": "^2.0", - "ocramius/proxy-manager": "<2.3", - "ocramius/package-versions": "<1.5" + "laminas/laminas-dependency-plugin": "^2.0" }, "require-dev": { "roave/security-advisories": "dev-master", diff --git a/scripts/update-all.sh b/scripts/update-all.sh index 55ea400..d5d0bac 100755 --- a/scripts/update-all.sh +++ b/scripts/update-all.sh @@ -29,12 +29,14 @@ do esac done -pull_if_exists() { - if [ -d $1 ]; then - pushd $1 - git pull - popd - fi +checkout_to_latest_tag() { + if [ -d $1 ]; then + pushd $1 + git fetch --tags + tag=$(git describe --tags `git rev-list --tags --max-count=1`) + git checkout $tag -b latest + popd + fi } migrate_module() { @@ -86,8 +88,8 @@ fi if [[ -d node_modules && -d node_modules/ng_anr ]]; then if [[ -d node_modules/ng_anr/.git ]]; then - pull_if_exists node_modules/ng_client - pull_if_exists node_modules/ng_anr + checkout_to_latest_tag node_modules/ng_client + checkout_to_latest_tag node_modules/ng_anr else npm update fi