Skip to content

Commit

Permalink
Add nix-build for multi-arch static binaries
Browse files Browse the repository at this point in the history
Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
  • Loading branch information
saschagrunert committed Sep 8, 2023
1 parent 6feea14 commit 977b75f
Show file tree
Hide file tree
Showing 13 changed files with 113 additions and 0 deletions.
25 changes: 25 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ env:
CARGO_TERM_COLOR: always
GO_VERSION: '1.20'
ACTION_MSRV_TOOLCHAIN: 1.69.0
NIX_VERSION: '2.17.0'
jobs:
build:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -122,6 +123,30 @@ jobs:
glob: latest-*.txt
destination: cri-o/conmon-rs

build-static:
runs-on: ubuntu-latest
strategy:
matrix:
arch: [amd64, arm64, ppc64le]
name: build-static-${{ matrix.arch }}
steps:
- uses: actions/checkout@v4
- uses: cachix/install-nix-action@v23
with:
install_url: https://releases.nixos.org/nix/nix-${{ env.NIX_VERSION }}/install
- uses: cachix/cachix-action@v12
with:
name: conmon-rs
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
pushFilter: "(conmon-rs|cargo-vendor)"
- run: nix-build nix/default-${{ matrix.arch }}.nix
- run: file result/bin/conmonrs | grep static | grep stripped
- uses: actions/upload-artifact@v3
with:
name: build-static-${{ matrix.arch }}
path: |
result/bin/conmonrs
doc:
runs-on: ubuntu-latest
steps:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
*.orig
*.test
/target
/result
/vendor
.build
latest-*.txt
Expand Down
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -108,3 +108,7 @@ install:
.PHONY: rpm
rpm:
rpkg local

nixpkgs:
@nix run -f channel:nixpkgs-unstable nix-prefetch-git -- \
--no-deepClone https://github.com/nixos/nixpkgs > nix/nixpkgs.json
6 changes: 6 additions & 0 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,9 @@ dependencies:
refPaths:
- path: contrib/tracing/start
match: OTLP_IMG

- name: nix
version: 2.17.0
refPaths:
- path: .github/workflows/ci.yml
match: NIX_VERSION
1 change: 1 addition & 0 deletions nix/default-amd64.nix
7 changes: 7 additions & 0 deletions nix/default-arm64.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
(import ./nixpkgs.nix {
crossSystem = {
config = "aarch64-unknown-linux-gnu";
};
overlays = [ (import ./overlay.nix) ];
}).callPackage ./derivation.nix
{ }
7 changes: 7 additions & 0 deletions nix/default-ppc64le.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
(import ./nixpkgs.nix {
crossSystem = {
config = "powerpc64le-unknown-linux-gnu";
};
overlays = [ (import ./overlay.nix) ];
}).callPackage ./derivation.nix
{ }
4 changes: 4 additions & 0 deletions nix/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
(import ./nixpkgs.nix {
overlays = [ (import ./overlay.nix) ];
}).callPackage ./derivation.nix
{ }
23 changes: 23 additions & 0 deletions nix/derivation.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{ pkgs }:
with pkgs; rustPlatform.buildRustPackage {
name = "conmon-rs";
src = ./..;
doCheck = false;
nativeBuildInputs = with buildPackages; [
capnproto
protobuf
];
buildInputs = [
glibc
glibc.static
];
RUSTFLAGS = [
"-Ctarget-feature=+crt-static"
];
stripAllList = [ "bin" ];
cargoLock = {
lockFile = lib.cleanSource ./.. + "/Cargo.lock";
allowBuiltinFetchGit = true;
};
}

12 changes: 12 additions & 0 deletions nix/nixpkgs.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"url": "https://github.com/nixos/nixpkgs",
"rev": "c44317643ebf160b50a86a23d203d99aaee8c133",
"date": "2023-09-08T07:22:05+00:00",
"path": "/nix/store/gscd59h9fppxwblgz19q24wg0jj8x4gg-nixpkgs",
"sha256": "1kr94ygwqirgmfpzyz3qz3wjfp28rqbmz2n565mssrlk0j3khwqx",
"hash": "sha256-HXM4hwSTZq1rMcWKXxfOSFwn+fh4fP+vqy9HzJ8nKc8=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
}
8 changes: 8 additions & 0 deletions nix/nixpkgs.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
let
json = builtins.fromJSON (builtins.readFile ./nixpkgs.json);
nixpkgs = import (builtins.fetchTarball {
name = "nixos-unstable";
url = "${json.url}/tarball/${json.rev}";
inherit (json) sha256;
});
in nixpkgs
5 changes: 5 additions & 0 deletions nix/overlay.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
let
static = import ./static.nix;
in
self: super:
{ }
10 changes: 10 additions & 0 deletions nix/static.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
pkg: pkg.overrideAttrs (x: {
doCheck = false;
configureFlags = (x.configureFlags or [ ]) ++ [
"--without-shared"
"--disable-shared"
];
dontDisableStatic = true;
enableSharedExecutables = false;
enableStatic = true;
})

0 comments on commit 977b75f

Please sign in to comment.