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.

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

Support Debian i386 in CI #53

Merged
merged 2 commits into from
Sep 17, 2023
Merged

Support Debian i386 in CI #53

merged 2 commits into from
Sep 17, 2023

Conversation

TheTumultuousUnicornOfDarkness
Copy link
Collaborator

As suggested by @rmartin16 in #52, it would be better to support i386 (when available) in order to avoid issue like #50.
This PR adds a new arch field in the matrix that can be extended thanks to the jobs.<job_id>.strategy.matrix.include keyword. Only Debian still support i386, so there are 4 jobs for Debian (GTK3/4 i386/amd64) but no changes for other distro.

@TheTumultuousUnicornOfDarkness
Copy link
Collaborator Author

Hello @TheAssassin,

Can you have a look on this PR, please?

include:
- gtk-version: gtk3
linux-distro: debian
arch: 386
Copy link
Member

Choose a reason for hiding this comment

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

i386 would be more idiomatic, would not be interpreted as an int by accident and also is in line with Debian's architecture naming (amd64 is, too), which might make some things more straightforward.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Copy link
Member

Choose a reason for hiding this comment

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

I see. I've always used the i386/debian image. These prefixes are clearly inspired by Debian. I don't mind using 386 then. Maybe it should be put in quotes, though, to make sure it's considered a string.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Well, it seems i386 is also valid and pulls the correct image. Let's see CI result with bba4017 then.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Run buildah bud --arch="${ARCHITECTURE}" --build-arg MACHINE="${MACHINE}" --tag "${IMAGE_NAME}" --file "containers/${GTK_VERSION}/Dockerfile.${LINUX_DISTRO}" .
[1/2] STEP 1/13: FROM docker.io/debian:buster AS build-stage
Trying to pull docker.io/library/debian:buster...
error creating build container: choosing an image from manifest list docker://debian:buster: no image found in manifest list for architecture i386, variant "", OS linux
[2/2] STEP 1/7: FROM docker.io/debian:buster
time="2023-09-17T12:41:48Z" level=error msg="exit status 125"
Error: Process completed with exit code 125.

Nope, i386 is not understood by Buildah.

Copy link
Member

Choose a reason for hiding this comment

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

I really don't insist on it. Your first attempt worked fine. I was just a bit curious on why it was that value specifically.

- name: Set extra environment variables
run: |
case "${ARCHITECTURE}" in
386) echo MACHINE="i386" >> "$GITHUB_ENV";;
Copy link
Member

Choose a reason for hiding this comment

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

If you change 386 to i386, you can just have a default case to set MACHINE to $ARCHITECTURE.

@TheAssassin
Copy link
Member

Sorry for the long time to this review. I was quite busy in the last months.

@TheTumultuousUnicornOfDarkness
Copy link
Collaborator Author

Sorry for the long time to this review. I was quite busy in the last months.

Do not worry, I did not remember me neither.

@TheTumultuousUnicornOfDarkness
Copy link
Collaborator Author

It was not working with i386: I removed bba4017.

@TheAssassin TheAssassin merged commit 0a983ad into master Sep 17, 2023
22 checks passed
@TheAssassin
Copy link
Member

Thanks!

@TheAssassin TheAssassin deleted the ci_debian_i386 branch September 17, 2023 12:48
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.

2 participants