Skip to content

Drop i686-linux build #627

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Drop i686-linux build #627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b80e8b3
Drop i686-linux build
edolstra Nov 11, 2025
fa480a0
Run 'nix flake check' in CI
edolstra Nov 11, 2025
92adc41
Don't run every CI job twice on PRs
edolstra Nov 11, 2025
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
6 changes: 5 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ on:
pull_request:
merge_group:
push:
branches:
- master
jobs:
shellcheck:
runs-on: ubuntu-latest
Expand All @@ -14,7 +16,9 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: cachix/install-nix-action@v31
- run: nix-build -A hydraJobs.release
- run: |
nix flake check --extra-experimental-features 'nix-command flakes' --all-systems --no-build
nix-build -A hydraJobs.release
ubuntu:
runs-on: ubuntu-latest
steps:
Expand Down
9 changes: 0 additions & 9 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

supportedSystems = [
"x86_64-linux"
"i686-linux"
"aarch64-linux"
];
forAllSystems = lib.genAttrs supportedSystems;
Expand Down Expand Up @@ -174,14 +173,12 @@
constituents = [
self.hydraJobs.tarball
self.hydraJobs.build.x86_64-linux
self.hydraJobs.build.i686-linux
Copy link
Member

@Mic92 Mic92 Nov 11, 2025

Choose a reason for hiding this comment

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

should we not rather exclude pre-commit for 32-bit? I think patchelf in nixpkgs ist still needed for 32-bit libs.

Copy link
Member

@Mic92 Mic92 Nov 11, 2025

Choose a reason for hiding this comment

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

pkgsi686Linux still has quiet a few references.

Copy link
Member Author

@edolstra edolstra Nov 12, 2025

Choose a reason for hiding this comment

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

That's what I initially tried, but flake-parts seems to pull in pre-commit as well in the dev shell. We could just remove devShells.i686-linux.default...

self.hydraJobs.build-cmake.x86_64-linux
self.hydraJobs.build-meson.x86_64-linux
# FIXME: add aarch64 emulation to our github action...
#self.hydraJobs.build.aarch64-linux
self.hydraJobs.build-sanitized.x86_64-linux
#self.hydraJobs.build-sanitized.aarch64-linux
self.hydraJobs.build-sanitized.i686-linux
self.hydraJobs.build-sanitized-clang.x86_64-linux
];
meta.description = "Release-critical builds";
Expand Down Expand Up @@ -228,9 +225,6 @@
glibc = mkShell self.packages.${system}.patchelf;
default = self.devShells.${system}.glibc;
}
// lib.optionalAttrs (system != "i686-linux") {
musl = mkShell self.packages.${system}.patchelf-musl;
}
);

packages = forAllSystems (
Expand Down Expand Up @@ -287,9 +281,6 @@
patchelf-win32 = patchelfForWindowsStatic pkgs.pkgsCross.mingw32;
patchelf-win64 = patchelfForWindowsStatic pkgs.pkgsCross.mingwW64;
}
// lib.optionalAttrs (system != "i686-linux") {
patchelf-musl = patchelfFor nixpkgs.legacyPackages.${system}.pkgsMusl;
}
);

};
Expand Down