Skip to content

Conversation

@dependabot
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Mar 25, 2024

Bumps rdoc from 6.6.2 to 6.6.3.1.

Commits

Dependabot compatibility score

You can trigger a rebase of this PR by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
    You can disable automated security fix PRs for this repo from the Security Alerts page.

Note
Automatic rebases have been disabled on this pull request as it has been open for over 30 days.

@dependabot dependabot bot added dependencies Pull requests that update a dependency file ruby Pull requests that update Ruby code labels Mar 25, 2024
Bumps [rdoc](https://github.com/ruby/rdoc) from 6.6.2 to 6.6.3.1.
- [Release notes](https://github.com/ruby/rdoc/releases)
- [Changelog](https://github.com/ruby/rdoc/blob/master/History.rdoc)
- [Commits](ruby/rdoc@v6.6.2...v6.6.3.1)

---
updated-dependencies:
- dependency-name: rdoc
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot dependabot bot force-pushed the dependabot/bundler/rdoc-6.6.3.1 branch from fe22f8a to ed06f51 Compare April 5, 2024 02:39
@yegor256
Copy link
Owner

@rultor please, try to merge

@rultor
Copy link
Collaborator

rultor commented May 20, 2025

@rultor please, try to merge

@yegor256 OK, I'll try to merge now. You can check the progress of the merge here.

@rultor
Copy link
Collaborator

rultor commented May 20, 2025

@rultor please, try to merge

@dependabot[bot] @yegor256 Oops, I failed. You can see the full log here (spent 1min).

+ cd repo
+ git config user.email [email protected]
+ git config user.name Rultor.com
+ '[' -z 'export '\''[email protected]:yegor256/netbout.git'\''' ']'
+ cd ..
+ cat
+ '[' false = true ']'
+ cat
+ chmod a+x entry.sh
+ cat
+ echo 'export '\''[email protected]:yegor256/netbout.git'\''' ';' 'export '\''pull_id=1227'\''' ';' 'export '\''[email protected]:yegor256/netbout.git'\''' ';' 'export '\''fork_branch=dependabot/bundler/rdoc-6.6.3.1'\''' ';' 'export '\''head_branch=master'\''' ';' 'export '\''pull_title=Bump rdoc from 6.6.2 to 6.6.3.1'\''' ';' 'export '\''author=yegor256'\''' ';' 'export PATH=$PATH:/usr/lib/postgresql/10/bin' ';' 'sudo apt-get -y update' ';' 'sudo apt-get install --yes libpq-dev' ';' 'pdd -f /dev/null' ';' 'bundle install --no-color' ';' 'bundle exec rake' ';'
+ sensitive=('config.yml')
+ set -ex -o pipefail
+ cd repo
+ git remote add fork [email protected]:yegor256/netbout.git
+ git remote update
Fetching origin
Fetching fork
From github.com:yegor256/netbout
 * [new branch]          569                      -> fork/569
 * [new branch]          cache                    -> fork/cache
 * [new branch]          dependabot/bundler/rdoc-6.6.3.1 -> fork/dependabot/bundler/rdoc-6.6.3.1
 * [new branch]          gh-pages                 -> fork/gh-pages
 * [new branch]          master                   -> fork/master
 * [new branch]          renovate/glogin-0.x-lockfile -> fork/renovate/glogin-0.x-lockfile
 * [new branch]          renovate/pgtk-0.x-lockfile -> fork/renovate/pgtk-0.x-lockfile
 * [new branch]          renovate/rspec-rails-8.x -> fork/renovate/rspec-rails-8.x
 * [new branch]          renovate/rubocop-1.x-lockfile -> fork/renovate/rubocop-1.x-lockfile
 * [new branch]          renovate/rubygems-rack-vulnerability -> fork/renovate/rubygems-rack-vulnerability
 * [new branch]          timeout                  -> fork/timeout
+ args=()
+ '[' default == default ']'
+ args+=(--ff)
+ '[' default == no ']'
+ '[' default == only ']'
+ '[' false == true ']'
+ BRANCH=__rultor
++ wc -l
++ git show-branch __rultor
+ '[' 0 -gt 0 ']'
+ export BRANCH
+ 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/dependabot/bundler/rdoc-6.6.3.1
Switched to a new branch '__rultor'
Branch '__rultor' set up to track remote branch 'dependabot/bundler/rdoc-6.6.3.1' 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 ']'
+ KEY=3FD3FA7E9AF0FA4C
+ git merge --gpg-sign=3FD3FA7E9AF0FA4C --no-edit -m 'Bump rdoc from 6.6.2 to 6.6.3.1' --ff __rultor
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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dependencies Pull requests that update a dependency file ruby Pull requests that update Ruby code

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants