Skip to content

GHA: Fix amazonlinux:2023 MariaDB package#10430

Merged
julianbrost merged 1 commit intomasterfrom
gha-fix-amazonlinux2023-mariadb-package
May 5, 2025
Merged

GHA: Fix amazonlinux:2023 MariaDB package#10430
julianbrost merged 1 commit intomasterfrom
gha-fix-amazonlinux2023-mariadb-package

Conversation

@oxzi
Copy link
Copy Markdown
Member

@oxzi oxzi commented May 5, 2025

Since recently, the amazonlinux:2023 job in the Linux action fails due to conflichting 'mariadb1*-devel' packages.

package mariadb1011-devel-3:10.11.11-1.amzn2023.0.1.x86_64 from amazonlinux conflicts with mariadb105-devel provided by mariadb105-devel-3:10.5.16-1.amzn2023.0.7.x86_64 from amazonlinux

It seems like Amazon Linux added mariadb1011 packages next to mariadb105 packages, resulting in a conflict due to the wildcard. On prior runs, the mariadb105 packages was installed.

This change installs mariadb-connector-c-devel instead of a specific mariadb1*-devel package, as suggested by the package description.

@oxzi oxzi requested a review from Al2Klimov May 5, 2025 11:31
@oxzi oxzi added the area/ci CI/CD label May 5, 2025
@cla-bot cla-bot bot added the cla/signed label May 5, 2025
@julianbrost
Copy link
Copy Markdown
Member

Would you mind trying what happens when installing mariadb-connector-c-devel instead? That (or mysql-devel depending on the distribution+version) is what we install as build dependency in the spec file. Sounds also more robust given that it doesn't contain a version number.

Al2Klimov
Al2Klimov previously approved these changes May 5, 2025
Since recently, the amazonlinux:2023 job in the Linux action fails due
to conflichting 'mariadb1*-devel' packages.

> package mariadb1011-devel-3:10.11.11-1.amzn2023.0.1.x86_64 from amazonlinux conflicts with mariadb105-devel provided by mariadb105-devel-3:10.5.16-1.amzn2023.0.7.x86_64 from amazonlinux

It seems like Amazon Linux added mariadb1011 packages next to mariadb105
packages, resulting in a conflict due to the wildcard. On prior runs,
the mariadb105 packages was installed.

This change installs mariadb-connector-c-devel instead of a specific
mariadb1*-devel package, as suggested by the package description.
@oxzi oxzi force-pushed the gha-fix-amazonlinux2023-mariadb-package branch from 22d6c1c to 6f57255 Compare May 5, 2025 12:33
@oxzi
Copy link
Copy Markdown
Member Author

oxzi commented May 5, 2025

Would you mind trying what happens when installing mariadb-connector-c-devel instead? That (or mysql-devel depending on the distribution+version) is what we install as build dependency in the spec file. Sounds also more robust given that it doesn't contain a version number.

bash-5.2# dnf search 'mariadb*-devel'
Last metadata expiration check: 0:00:24 ago on Mon May  5 12:26:15 2025.
================================================ Name Matched: mariadb*-devel =================================================
mariadb-connector-c-devel.x86_64 : Development files for mariadb-connector-c
mariadb1011-devel.x86_64 : Files for development of MariaDB/MySQL applications
mariadb105-devel.x86_64 : Files for development of MariaDB/MySQL applications

bash-5.2# dnf info mariadb105-devel | tail -n4
             : This package contains everything needed for developing MariaDB/MySQL server
             : plugins and applications. For developing client applications, use
             : mariadb-connector-c package.

Valid point, I have updated the PR. Please take another look.

@oxzi oxzi requested review from Al2Klimov and julianbrost May 5, 2025 12:34
Copy link
Copy Markdown
Member

@Al2Klimov Al2Klimov left a comment

Choose a reason for hiding this comment

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

OK for GHA = ok for me

@oxzi oxzi changed the title GHA: Fix amazonlinux:2023 by specific MariaDB package GHA: Fix amazonlinux:2023 MariaDB package May 5, 2025
@julianbrost julianbrost merged commit e34f45c into master May 5, 2025
26 checks passed
@julianbrost julianbrost deleted the gha-fix-amazonlinux2023-mariadb-package branch May 5, 2025 15:27
@julianbrost julianbrost added this to the 2.15.0 milestone May 14, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants