mirror of
https://github.com/Icinga/icinga-php-thirdparty.git
synced 2025-07-31 01:24:23 +02:00
Compare commits
10 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
3ffc4e5833 | ||
|
2d8baeafe4 | ||
|
50f68d3fc3 | ||
|
3bc4158c81 | ||
|
63e153614d | ||
|
a3a9a0f9a8 | ||
|
6c862b2ab8 | ||
|
426e244015 | ||
|
a843109028 | ||
|
3a4ac0eae4 |
5
.github/dependabot.yml
vendored
5
.github/dependabot.yml
vendored
@ -2,5 +2,10 @@ version: 2
|
||||
updates:
|
||||
- package-ecosystem: "composer"
|
||||
directory: "/"
|
||||
open-pull-requests-limit: 20 # Roughly half the number of dependencies
|
||||
groups:
|
||||
composer:
|
||||
update-types:
|
||||
- "patch"
|
||||
schedule:
|
||||
interval: "daily"
|
||||
|
@ -21,8 +21,8 @@ git checkout -b $BRANCH
|
||||
|
||||
git mv composer.lock composer.lock.bak
|
||||
git commit -am "Backup composer.lock"
|
||||
git merge --no-ff -m "Merge latest tag, package pipelines require it" $LATEST_TAG
|
||||
git merge --no-ff -m "Merge latest tag, package pipelines require it" $LATEST_TAG || (git checkout --ours composer.lock.bak && git add composer.lock.bak && git commit --no-edit)
|
||||
git mv -f composer.lock.bak composer.lock
|
||||
git commit -am "Restore composer.lock"
|
||||
git commit -am "Restore composer.lock" || true # in case composer.lock was not modified
|
||||
|
||||
bin/make-release.sh "$NEXT_VERSION-dev" --no-checkout
|
||||
|
624
composer.lock
generated
624
composer.lock
generated
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user