Skip to content

roachtest: use activerecord 6.1.3#68329

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
rafiss:use-ar-6.1.3
Aug 2, 2021
Merged

roachtest: use activerecord 6.1.3#68329
craig[bot] merged 1 commit intocockroachdb:masterfrom
rafiss:use-ar-6.1.3

Conversation

@rafiss
Copy link
Copy Markdown
Collaborator

@rafiss rafiss commented Aug 2, 2021

This should resolve the failure where the test cannot run right now.

fixes #66827

Release note: None

This should resolve the failure where the test cannot run right now

Release note: None
@rafiss rafiss requested review from a team and RichardJCai August 2, 2021 15:59
@rafiss rafiss requested a review from a team as a code owner August 2, 2021 15:59
@rafiss rafiss requested review from erikgrinaker and removed request for a team August 2, 2021 15:59
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

Copy link
Copy Markdown
Contributor

@erikgrinaker erikgrinaker left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Why does this help?

@rafiss
Copy link
Copy Markdown
Collaborator Author

rafiss commented Aug 2, 2021

tftr!

it helps because the test is currently failing with File does not exist: /mnt/data1/activerecord-cockroachdb-adapter/test/cases/helper_cockroachdb

This was fixed upstream by cockroachdb/activerecord-cockroachdb-adapter@72064b1 which is released in activerecord-cockroachdb-adapter 6.1.3

bors r=erikgrinaker

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Aug 2, 2021

Build succeeded:

@craig craig bot merged commit 635c263 into cockroachdb:master Aug 2, 2021
@blathers-crl
Copy link
Copy Markdown

blathers-crl bot commented Aug 2, 2021

Encountered an error creating backports. Some common things that can go wrong:

  1. The backport branch might have already existed.
  2. There was a merge conflict.
  3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.


error creating merge commit from 3e2af3c to blathers/backport-release-20.2-68329: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 20.2.x failed. See errors above.


error creating merge commit from 3e2af3c to blathers/backport-release-21.1-68329: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 21.1.x failed. See errors above.


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is otan.

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

roachtest: activerecord failed

3 participants