Skip to content

Commit

Permalink
Merge pull request #5957 from IntersectMBO/bench-podman
Browse files Browse the repository at this point in the history
wb | simplify and remove dependencies
  • Loading branch information
fmaste authored Sep 12, 2024
2 parents 3a058a3 + da7dee7 commit 0841051
Show file tree
Hide file tree
Showing 21 changed files with 496 additions and 1,719 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ trace-documentation:
###
### Workbench
###
workbench-ci: workbench-ci-test ci-test-auto ci-test-autonix ci-test-autonomadpodman
workbench-ci: workbench-ci-test ci-test-auto ci-test-autonix
CI_TARGETS := hlint workbench-ci haddock-hoogle
ci: ci-report ci-targets
ci-report:
Expand Down
72 changes: 2 additions & 70 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 1 addition & 4 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,6 @@

std.url = "github:divnix/std";

nix2container.url = "github:nlewo/nix2container";

cardano-automation = {
url = "github:input-output-hk/cardano-automation";
inputs = {
Expand All @@ -78,7 +76,6 @@
, ops-lib
, cardano-mainnet-mirror
, std
, nix2container
, cardano-automation
, em
, ...
Expand Down Expand Up @@ -106,7 +103,7 @@
iohkNix.overlays.cardano-lib
iohkNix.overlays.utils
(final: prev: {
inherit customConfig nix2container;
inherit customConfig;
bench-data-publish = cardano-automation.outputs.packages.${final.system}."bench-data-publish:exe:bench-data-publish";
em = import em { inherit (final) system;
nixpkgsSrcs = nixpkgs.outPath;
Expand Down
2 changes: 0 additions & 2 deletions lib.mk
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ $$(foreach prof,$(1),$$(eval $$(call proftgt,$$(prof)-nix, $$(prof)
$$(foreach prof,$(1),$$(eval $$(call proftgt,$$(prof)-autonix, $$(prof), true,false, true,false, false, supervisor)))
$$(foreach prof,$(1),$$(eval $$(call proftgt,$$(prof)-nomadexec, $$(prof), true,false,false,false, false, nomadexec)))
$$(foreach prof,$(1),$$(eval $$(call proftgt,$$(prof)-nomadexec-auto, $$(prof), true,false, true,false, false, nomadexec)))
$$(foreach prof,$(1),$$(eval $$(call proftgt,$$(prof)-nomadpodman, $$(prof), true,false,false,false, false, nomadpodman)))
$$(foreach prof,$(1),$$(eval $$(call proftgt,$$(prof)-nomadpodman-auto, $$(prof), true,false, true,false, false, nomadpodman)))
endef

define define_profile_targets_nomadcloud
Expand Down
2 changes: 0 additions & 2 deletions nix/pkgs.nix
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ let
import ./workbench/backend/nomad/cloud.nix params;
nomadexec = params:
import ./workbench/backend/nomad/exec.nix params;
nomadpodman = params:
import ./workbench/backend/nomad/podman.nix params;
supervisor = params:
import ./workbench/backend/supervisor.nix params;
}
Expand Down
Loading

0 comments on commit 0841051

Please sign in to comment.