Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Extend galera artifacts to lunar and mantic #258

Merged
merged 1 commit into from
Nov 22, 2023
Merged

Extend galera artifacts to lunar and mantic #258

merged 1 commit into from
Nov 22, 2023

Conversation

grooverdan
Copy link
Member

Should have been included in #221 change

They are in the artifacts buillt on galera.

@fauust
Copy link
Collaborator

fauust commented Nov 18, 2023

Please use VERSION_ID codename is too confusing.

@grooverdan
Copy link
Member Author

Please use VERSION_ID codename is too confusing.

VERSION_ID is too absent:

$ podman run --rm debian:trixie cat /etc/os-release
Resolved "debian" as an alias (/etc/containers/registries.conf.d/000-shortnames.conf)
Trying to pull docker.io/library/debian:trixie...
Getting image source signatures
Copying blob 9f30dcdc5629 done   | 
Copying config 165eaa81d1 done   | 
Writing manifest to image destination
PRETTY_NAME="Debian GNU/Linux trixie/sid"
NAME="Debian GNU/Linux"
VERSION_CODENAME=trixie
ID=debian
HOME_URL="https://www.debian.org/"
SUPPORT_URL="https://www.debian.org/support"
BUG_REPORT_URL="https://bugs.debian.org/"

@grooverdan grooverdan requested a review from fauust November 20, 2023 07:35
@fauust
Copy link
Collaborator

fauust commented Nov 20, 2023 •
edited
Loading

This is only affecting trixie (not sure why) and sid (which is handled differently anyway). And we want to avoid such errors.

Or the typo in the title of this PR.

@grooverdan grooverdan force-pushed the extend_galera_artifacts branch from 7d837a0 to a2d13a2 Compare November 20, 2023 21:35
@grooverdan
Copy link
Member Author

This is only affecting trixie (not sure why)
and sid (which is handled differently anyway).

Answer in above link.

Seems trixie is handled like sid in Debian, looking at https://packages.debian.org/trixie/mariadb-server there's no version 13 on the file while released version have debXu1.

And we want to avoid such errors.

I agree. Its a good move if available.

Or the typo in the title of this PR.

Or the two (just corrected) in the commit message.

@grooverdan grooverdan changed the title Extend galera artifacts to lunar and manic Extend galera artifacts to lunar and mantic Nov 20, 2023
fauust
fauust approved these changes Nov 21, 2023
View reviewed changes
Copy link
Collaborator

@fauust fauust left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Ok, let's use VERSION_ID if available.
That should be the case for all distribution but Debian testing and unstable (respectively Trixie and Sid ATM).

I find it anyway much easier to remember CODENAME on Debian since the Release rhythm is at least 4 times more frequent for Ubuntu.

ci_build_images/debian.Dockerfile Outdated
@@ -30,8 +30,8 @@ RUN . /etc/os-release; \
&& if [ "${VERSION_ID}" = "20.04" ]; then apt-get -y install --no-install-recommends g++-10; fi \
&& if [ "$(arch)" = "x86_64" ]; then ARCH="amd64"; else ARCH=$(arch); fi \
&& curl -s "https://ci.mariadb.org/galera/mariadb-4.x-latest-gal-${ARCH}-${ID}-$(echo "$VERSION_ID" | sed 's/\.//').sources" >/etc/apt/sources.list.d/galera-4.sources \
&& if [ "${VERSION_CODENAME}" = lunar ] && [ "$ARCH" = aarch64 ]; then rm /etc/apt/sources.list.d/galera-4.sources; fi \
&& if [ "${VERSION_CODENAME}" = trixie ] || [ "${VERSION_CODENAME}" = mantic ] || [ "$(getconf LONG_BIT)" = 32 ]; then rm /etc/apt/sources.list.d/galera-4.sources; fi \
# VERSION_ID=13 once relesed \
Copy link
Collaborator

Choose a reason for hiding this comment

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

typo

@grooverdan
Extend galera artifacts to lunar and mantic
52a4b45 
Should have been included in MariaDB#221 change
@grooverdan grooverdan force-pushed the extend_galera_artifacts branch from a2d13a2 to 52a4b45 Compare November 22, 2023 01:47
@grooverdan grooverdan merged commit 2f1c4af into MariaDB:dev Nov 22, 2023
22 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fauust fauust fauust approved these changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@grooverdan @fauust