Skip to content

guix: Default to building for some supported HOSTs only #6388

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

Closed
UdjinM6 wants to merge 1 commit into from
Closed

guix: Default to building for some supported HOSTs only #6388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/guix-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
# if: ${{ contains(github.event.pull_request.labels.*.name, 'guix-build') }}
strategy:
matrix:
build_target: [x86_64-linux-gnu, arm-linux-gnueabihf, aarch64-linux-gnu, riscv64-linux-gnu, x86_64-w64-mingw32, x86_64-apple-darwin, arm64-apple-darwin]
build_target: [x86_64-linux-gnu, aarch64-linux-gnu, riscv64-linux-gnu, x86_64-w64-mingw32, x86_64-apple-darwin, arm64-apple-darwin]

timeout-minutes: 480
steps:
Expand Down
10 changes: 7 additions & 3 deletions contrib/guix/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,9 +222,13 @@ details.
Override the space-separated list of platform triples for which to perform a
bootstrappable build.

_(defaults to "x86\_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu
powerpc64-linux-gnu powerpc64le-linux-gnu
x86\_64-w64-mingw32 x86\_64-apple-darwin arm64-apple-darwin")_
Supported platform triples: aarch64-linux-gnu, arm-linux-gnueabihf,
arm64-apple-darwin, powerpc64-linux-gnu, powerpc64le-linux-gnu,
riscv64-linux-gnu, x86\_64-apple-darwin, x86\_64-linux-gnu and
x86\_64-w64-mingw32.

_(defaults to "x86\_64-linux-gnu aarch64-linux-gnu x86\_64-w64-mingw32
x86\_64-apple-darwin arm64-apple-darwin")_

* _**SOURCES_PATH**_

Expand Down
15 changes: 13 additions & 2 deletions contrib/guix/guix-build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,19 @@ mkdir -p "$VERSION_BASE"
# Build directories should not exist
################

# Default to building for all supported HOSTs (overridable by environment)
export HOSTS="${HOSTS:-x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu riscv64-linux-gnu powerpc64-linux-gnu powerpc64le-linux-gnu
# Supported HOSTs:
# aarch64-linux-gnu
# arm-linux-gnueabihf
# arm64-apple-darwin
# powerpc64-linux-gnu
# powerpc64le-linux-gnu
# riscv64-linux-gnu
# x86_64-apple-darwin
# x86_64-linux-gnu
# x86_64-w64-mingw32

# Default to building for some supported HOSTs only (overridable by environment)
export HOSTS="${HOSTS:-x86_64-linux-gnu aarch64-linux-gnu riscv64-linux-gnu
Copy link
Copy Markdown
Collaborator

@knst knst Nov 10, 2024

Choose a reason for hiding this comment

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

should we ask in community if anyone has powerpc64 or arm32 to test? maybe there's non-zero demand for it? So far as build succeed, probably the binaries may work as well

Copy link
Copy Markdown
Collaborator

@kwvg kwvg Nov 10, 2024

Choose a reason for hiding this comment

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

Consider b58a3b6

Copy link
Copy Markdown
Author

@UdjinM6 UdjinM6 Nov 10, 2024

Choose a reason for hiding this comment

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

you mean in addition to changes in contrib/guix/guix-build or as a replacement?

Copy link
Copy Markdown
Collaborator

@kwvg kwvg Nov 10, 2024

Choose a reason for hiding this comment

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

Replacement, I think we should keep upstream code intact as much as we can and add restrictions through CI or our containers

Copy link
Copy Markdown
Member

@PastaPastaPasta PastaPastaPasta Nov 11, 2024

Choose a reason for hiding this comment

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

I disagree, mostly, because very little if any of my automations use the guis-start. They all use guix-buidl

Copy link
Copy Markdown
Collaborator

@kwvg kwvg Nov 11, 2024

Choose a reason for hiding this comment

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

./contrib/containers/guix/scripts/guix-start $(pwd) should be a drop-in

Copy link
Copy Markdown
Author

@UdjinM6 UdjinM6 Nov 11, 2024

Choose a reason for hiding this comment

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

Needs a couple of additional fixes but, yeah, it could work. Pls check #6390.

x86_64-w64-mingw32
x86_64-apple-darwin arm64-apple-darwin}"

Expand Down