Closed renovate[bot] closed 2 months ago
@rultor please, try to merge, since 4 checks have passed
@rultor please, try to merge, since 4 checks have passed
@yegor256 OK, I'll try to merge now. You can check the progress of the merge here
@rultor please, try to merge, since 4 checks have passed
@renovate[bot] @yegor256 Oops, I failed. You can see the full log here (spent 2min)
Cloning into 'repo'...
Warning: Permanently added 'github.com' (ED25519) to the list of known hosts.
+ cd repo
+ git config user.email me@rultor.com
+ git config user.name rultor
+ '[' -z 'export '\''head=git@github.com:yegor256/0pdd.git'\''' ']'
+ cd ..
+ cat
+ '[' false = true ']'
+ cat
+ chmod a+x entry.sh
+ cat
+ echo 'export '\''head=git@github.com:yegor256/0pdd.git'\''' ';' 'export '\''pull_id=639'\''' ';' 'export '\''fork=git@github.com:yegor256/0pdd.git'\''' ';' 'export '\''fork_branch=renovate/nokogiri-1.x'\''' ';' 'export '\''head_branch=master'\''' ';' 'export '\''pull_title=Update dependency nokogiri to v1.16.6'\''' ';' 'export '\''author=yegor256'\''' ';' 'git config --global user.email "server@0pdd.com"' ';' 'git config --global user.name "0pdd.com"' ';' 'sudo gem install pdd' ';' 'pdd -f /dev/null' ';' 'bundle install --no-color' ';' 'bundle exec rake' ';'
+ sensitive=('config.yml')
+ rm -rf .gnupg
+ cd repo
+ git remote add fork git@github.com:yegor256/0pdd.git
+ git remote update
Fetching origin
Fetching fork
From github.com:yegor256/0pdd
* [new branch] dependabot/bundler/nokogiri-1.16.2 -> fork/dependabot/bundler/nokogiri-1.16.2
* [new branch] master -> fork/master
* [new branch] renovate/aws-sdk-dynamodb-1.x -> fork/renovate/aws-sdk-dynamodb-1.x
* [new branch] renovate/gitlab-4.x -> fork/renovate/gitlab-4.x
* [new branch] renovate/major-octokit-monorepo -> fork/renovate/major-octokit-monorepo
* [new branch] renovate/mocha-2.x -> fork/renovate/mocha-2.x
* [new branch] renovate/nokogiri-1.x -> fork/renovate/nokogiri-1.x
* [new branch] renovate/sinatra-4.x -> fork/renovate/sinatra-4.x
+ args=
+ '[' default == default ']'
+ args=' --ff'
+ '[' default == no ']'
+ '[' default == only ']'
+ export BRANCH=__rultor
+ BRANCH=__rultor
++ wc -l
++ git show-branch __rultor
+ '[' 0 -gt 0 ']'
+ git status
On branch master
Your branch is up to date with 'origin/master'.
nothing to commit, working tree clean
+ git checkout -B __rultor fork/renovate/nokogiri-1.x
Switched to a new branch '__rultor'
Branch '__rultor' set up to track remote branch 'renovate/nokogiri-1.x' from 'fork'.
+ git checkout -B master origin/master
Switched to and reset branch 'master'
Branch 'master' set up to track remote branch 'master' from 'origin'.
Your branch is up to date with 'origin/master'.
+ '[' false == true ']'
+ '[' false == true ']'
+ git merge --ff __rultor
Auto-merging Gemfile
CONFLICT (content): Merge conflict in Gemfile
Auto-merging Gemfile.lock
CONFLICT (content): Merge conflict in Gemfile.lock
Automatic merge failed; fix conflicts and then commit the result.
'cid' file is absent, most probably the Docker container wasn't started correctly
This PR contains the following updates:
'1.16.5'
->'1.16.7'
Configuration
📅 Schedule: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).
🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.
â™» Rebasing: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.
🔕 Ignore: Close this PR and you won't be reminded about this update again.
This PR was generated by Mend Renovate. View the repository job log.