make-snapshot.sh: Really make sure to use the lastest stuff
Also defines the php version now based on the build environment
This commit is contained in:
parent
72d4035a65
commit
e3512954e3
|
@ -12,6 +12,7 @@ fi
|
|||
|
||||
LATEST_TAG=$(git for-each-ref refs/tags --sort=-taggerdate --format='%(refname)' --count=1 | awk -F/ '{print $3}')
|
||||
NEXT_VERSION=$(echo "${LATEST_TAG:1}" | awk -F. -v OFS=. '{$3=0}; {++$2}; {print}')
|
||||
PHP_VERSION=$(echo "<?= join('.', [PHP_MAJOR_VERSION, PHP_MINOR_VERSION, PHP_RELEASE_VERSION]); ?>" | php 2>/dev/null)
|
||||
|
||||
if [[ -n $(git branch | grep $BRANCH) ]]; then
|
||||
git branch -D $BRANCH
|
||||
|
@ -20,14 +21,16 @@ fi
|
|||
git checkout -b $BRANCH
|
||||
git merge --no-ff -m "Merge latest tag, to make it reachable for git-describe" $LATEST_TAG
|
||||
|
||||
composer config platform.php $PHP_VERSION
|
||||
composer require --no-update \
|
||||
ipl/html:@dev \
|
||||
ipl/i18n:@dev \
|
||||
ipl/orm:@dev \
|
||||
ipl/sql:@dev \
|
||||
ipl/stdlib:@dev \
|
||||
ipl/validator:@dev \
|
||||
ipl/web:@dev
|
||||
php:$PHP_VERSION \
|
||||
ipl/html:"dev-master as 99.x-dev" \
|
||||
ipl/i18n:"dev-master as 99.x-dev" \
|
||||
ipl/orm:"dev-master as 99.x-dev" \
|
||||
ipl/sql:"dev-master as 99.x-dev" \
|
||||
ipl/stdlib:"dev-master as 99.x-dev" \
|
||||
ipl/validator:"dev-master as 99.x-dev" \
|
||||
ipl/web:"dev-master as 99.x-dev"
|
||||
|
||||
git commit -a -m "Require dev-master everywhere"
|
||||
bin/make-release.sh "$NEXT_VERSION-dev" --no-checkout
|
||||
|
|
Loading…
Reference in New Issue