From a0c6f143efbf17aab137cb130282cc4e9785f173 Mon Sep 17 00:00:00 2001 From: UdjinM6 Date: Fri, 8 Nov 2024 22:27:43 +0300 Subject: [PATCH] guix: Default to building for some supported HOSTs only --- .github/workflows/guix-build.yml | 2 +- contrib/guix/README.md | 10 +++++++--- contrib/guix/guix-build | 15 +++++++++++++-- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/.github/workflows/guix-build.yml b/.github/workflows/guix-build.yml index 49d18bc292bc..f74dfcc895f6 100644 --- a/.github/workflows/guix-build.yml +++ b/.github/workflows/guix-build.yml @@ -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: diff --git a/contrib/guix/README.md b/contrib/guix/README.md index 94536700f855..e8eebb51cc40 100644 --- a/contrib/guix/README.md +++ b/contrib/guix/README.md @@ -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**_ diff --git a/contrib/guix/guix-build b/contrib/guix/guix-build index 415e97c57daa..21b9a4347f4b 100755 --- a/contrib/guix/guix-build +++ b/contrib/guix/guix-build @@ -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 x86_64-w64-mingw32 x86_64-apple-darwin arm64-apple-darwin}"