Skip to content

Commit f87cabf

Browse files
Make cachix builds from CI/CD match CLI/flake inputs (#81)
* make cachix builds from CI/CD match CLI/flake inputs * Set Version: 0.1.67 --------- Co-authored-by: devops <devops@runtimeverification.com>
1 parent a3ccbd6 commit f87cabf

3 files changed

Lines changed: 21 additions & 9 deletions

File tree

flake.nix

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,21 @@
1414
outputs = { self, k-framework, nixpkgs, flake-utils, rv-utils, wasm-semantics
1515
, rust-overlay, ... }@inputs:
1616
let
17+
mkCleanSource = { pkgs, src }: pkgs.lib.cleanSource (pkgs.nix-gitignore.gitignoreSourcePure [
18+
"/.github"
19+
"flake.nix"
20+
"flake.lock"
21+
./.gitignore
22+
# do not include submodule directories that might be initilized empty or non-existent
23+
"/deps/soroban-examples"
24+
] src
25+
);
1726
overlay = (final: prev:
1827
let
19-
src = prev.lib.cleanSource (prev.nix-gitignore.gitignoreSourcePure [
20-
"/.github"
21-
"flake.nix"
22-
"flake.lock"
23-
./.gitignore
24-
] ./.);
28+
src = mkCleanSource {
29+
src = ./.;
30+
pkgs = final;
31+
};
2532

2633
version = self.rev or "dirty";
2734
poetry2nix = inputs.poetry2nix.lib.mkPoetry2Nix { pkgs = prev; };
@@ -68,7 +75,12 @@
6875
pkgs = import nixpkgs { system = prev.system; };
6976
src = ./.;
7077
subdirectories = [ "pykwasm" ];
71-
cleaner = poetry2nix.cleanPythonSources;
78+
cleaner = { src }: poetry2nix.cleanPythonSources {
79+
src = (mkCleanSource {
80+
inherit src;
81+
pkgs = final;
82+
});
83+
};
7284
};
7385
overrides = poetry2nix.overrides.withDefaults
7486
(finalPython: prevPython: {

package/version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.1.66
1+
0.1.67

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
44

55
[tool.poetry]
66
name = "komet"
7-
version = "0.1.66"
7+
version = "0.1.67"
88
description = "K tooling for the Soroban platform"
99
authors = [
1010
"Runtime Verification, Inc. <contact@runtimeverification.com>",

0 commit comments

Comments
 (0)