Skip to content

Commit 9a5d94a

Browse files
committed
build: test new std branch for setting commit rev
1 parent 9366b3c commit 9a5d94a

File tree

4 files changed

+15
-14
lines changed

4 files changed

+15
-14
lines changed

flake.lock

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
66

77
## Std ##
8-
std.url = "github:divnix/std";
8+
std.url = "github:divnix/std/target-in-actions";
99
std.inputs.nixpkgs.follows = "nixpkgs";
1010

1111
# Rust overlay

nix/jormungandr/containers.nix

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88

99
mkOCI = namespace: let
1010
# TODO: fix git rev
11-
# rev =
12-
# if (inputs.self.rev != "not-a-commit")
13-
# then inputs.self.rev
14-
# else "dirty";
11+
rev =
12+
if (inputs.self.rev != "not-a-commit")
13+
then inputs.self.rev
14+
else "dirty";
1515
in
1616
std.lib.ops.mkStandardOCI {
1717
name = "${constants.registry}/jormungandr";
18-
tag = namespace;
18+
tag = "${rev}-${namespace}";
1919
operable = cell.operables."jormungandr-${namespace}";
2020
debug = true;
2121
};

nix/vit-servicing-station/containers.nix

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88

99
mkOCI = namespace: let
1010
# TODO: fix git rev
11-
# rev =
12-
# if (inputs.self.rev != "not-a-commit")
13-
# then inputs.self.rev
14-
# else "dirty";
11+
rev =
12+
if (inputs.self.rev != "not-a-commit")
13+
then inputs.self.rev
14+
else "dirty";
1515
in
1616
std.lib.ops.mkStandardOCI {
1717
name = "${constants.registry}/vit-servicing-station-server";
18-
tag = namespace;
18+
tag = "${rev}-${namespace}";
1919
operable = cell.operables."vit-servicing-station-server-${namespace}";
2020
debug = true;
2121
};

0 commit comments

Comments
 (0)