Skip to content

[v4.1] Restrict sqlite3 gem to '~> 1.3', like ActiveRecord#5969

Merged
tvdeyen merged 2 commits intov4.1from
backport/v4.1/pr-5727
Dec 2, 2024
Merged

[v4.1] Restrict sqlite3 gem to '~> 1.3', like ActiveRecord#5969
tvdeyen merged 2 commits intov4.1from
backport/v4.1/pr-5727

Conversation

@tvdeyen
Copy link
Copy Markdown
Member

@tvdeyen tvdeyen commented Dec 2, 2024

Backport

This will backport the following commits from main to v4.1:

Questions ?

Please refer to the Backport tool documentation

@tvdeyen tvdeyen requested a review from a team as a code owner December 2, 2024 16:12
@tvdeyen tvdeyen added backport-v4.0 Backport this pull-request to v4.0 backport-v4.1 Backport this pull-request to v4.1 backport-v4.2 Backport this pull-request to v4.2 backport-v4.3 Backport this pull-request to v4.3 changelog:repository Changes to the repository not within any gem labels Dec 2, 2024
@tvdeyen tvdeyen force-pushed the backport/v4.1/pr-5727 branch from 59c174e to e6373af Compare December 2, 2024 16:14
They just released sqlite3 2.0.0, but ActiveRecord's sqlite3 adapter
doesn't know about this yet, leading to conflicting sqlite3 gems in
specs.

This is probably a temporary fix until ActiveRecord learns the news.

(cherry picked from commit 4319e17)
The task itself is fine, as it inherits from
Rails' app generator, which has the sqlite3 restriction:
https://github.com/rails/rails/blob/main/railties/lib/rails/generators/database.rb#L19.

(cherry picked from commit e85fd4c)

# Conflicts:
#	.circleci/config.yml
@tvdeyen tvdeyen force-pushed the backport/v4.1/pr-5727 branch from e6373af to 79b19ad Compare December 2, 2024 16:26
@tvdeyen tvdeyen merged commit 20fe2da into v4.1 Dec 2, 2024
@tvdeyen tvdeyen deleted the backport/v4.1/pr-5727 branch December 2, 2024 16:36
@github-actions
Copy link
Copy Markdown

github-actions Bot commented Dec 2, 2024

💔 All backports failed

Status Branch Result
v4.0 Cherrypick failed because the selected commit (e406200) is empty. Did you already backport this commit?
v4.2 Cherrypick failed because the selected commit (e406200) is empty. Did you already backport this commit?
v4.3 Cherrypick failed because the selected commit (e406200) is empty. Did you already backport this commit?

Manual backport

To create the backport manually run:

backport --pr 5969

Questions ?

Please refer to the Backport tool documentation and see the Github Action logs for details

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

Labels

backport-v4.0 Backport this pull-request to v4.0 backport-v4.1 Backport this pull-request to v4.1 backport-v4.2 Backport this pull-request to v4.2 backport-v4.3 Backport this pull-request to v4.3 changelog:repository Changes to the repository not within any gem

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants