Merge pull request 'simplify job-flake-updates' (#66) from flake-parts-refactoring into main
All checks were successful
build / test (push) Successful in 8s
All checks were successful
build / test (push) Successful in 8s
This commit is contained in:
commit
17c49b869f
|
@ -20,18 +20,10 @@
|
||||||
inherit (config.writers) writePureShellScriptBin;
|
inherit (config.writers) writePureShellScriptBin;
|
||||||
inherit (config.packages) action-checkout action-ensure-tea-login action-create-pr action-flake-update;
|
inherit (config.packages) action-checkout action-ensure-tea-login action-create-pr action-flake-update;
|
||||||
};
|
};
|
||||||
job-flake-update-clan-core = pkgs.callPackage ./job-flake-update-clan-core {
|
inherit (pkgs.callPackages ./job-flake-updates {
|
||||||
inherit (config.writers) writePureShellScriptBin;
|
inherit (config.writers) writePureShellScriptBin;
|
||||||
inherit (config.packages) action-flake-update-pr-clan;
|
inherit (config.packages) action-flake-update-pr-clan;
|
||||||
};
|
}) job-flake-update-clan-core job-flake-update-clan-homepage job-flake-update-clan-infra;
|
||||||
job-flake-update-clan-homepage = pkgs.callPackage ./job-flake-update-clan-homepage {
|
|
||||||
inherit (config.writers) writePureShellScriptBin;
|
|
||||||
inherit (config.packages) action-flake-update-pr-clan;
|
|
||||||
};
|
|
||||||
job-flake-update-clan-infra = pkgs.callPackage ./job-flake-update-clan-infra {
|
|
||||||
inherit (config.writers) writePureShellScriptBin;
|
|
||||||
inherit (config.packages) action-flake-update-pr-clan;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +0,0 @@
|
||||||
{ bash
|
|
||||||
, action-flake-update-pr-clan
|
|
||||||
, writePureShellScriptBin
|
|
||||||
}:
|
|
||||||
writePureShellScriptBin "job-flake-update-clan-core" [ bash action-flake-update-pr-clan ] ''
|
|
||||||
bash ${./script.sh}
|
|
||||||
''
|
|
|
@ -1,10 +0,0 @@
|
||||||
{ bash
|
|
||||||
, action-flake-update-pr-clan
|
|
||||||
, writePureShellScriptBin
|
|
||||||
}:
|
|
||||||
writePureShellScriptBin "job-flake-update-clan-homepage" [
|
|
||||||
bash
|
|
||||||
action-flake-update-pr-clan
|
|
||||||
] ''
|
|
||||||
bash ${./script.sh}
|
|
||||||
''
|
|
|
@ -1,7 +0,0 @@
|
||||||
#!/usr/bin/env bash
|
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
export REPO="gitea@git.clan.lol:clan/clan-homepage.git"
|
|
||||||
export KEEP_VARS="REPO${KEEP_VARS:+ $KEEP_VARS}"
|
|
||||||
|
|
||||||
action-flake-update-pr-clan
|
|
|
@ -1,10 +0,0 @@
|
||||||
{ bash
|
|
||||||
, action-flake-update-pr-clan
|
|
||||||
, writePureShellScriptBin
|
|
||||||
}:
|
|
||||||
writePureShellScriptBin "job-flake-update-clan-infra" [
|
|
||||||
bash
|
|
||||||
action-flake-update-pr-clan
|
|
||||||
] ''
|
|
||||||
bash ${./script.sh}
|
|
||||||
''
|
|
|
@ -1,7 +0,0 @@
|
||||||
#!/usr/bin/env bash
|
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
export REPO="gitea@git.clan.lol:clan/clan-infra.git"
|
|
||||||
export KEEP_VARS="REPO${KEEP_VARS:+ $KEEP_VARS}"
|
|
||||||
|
|
||||||
action-flake-update-pr-clan
|
|
16
pkgs/job-flake-updates/default.nix
Normal file
16
pkgs/job-flake-updates/default.nix
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
{ action-flake-update-pr-clan
|
||||||
|
, writePureShellScriptBin
|
||||||
|
}:
|
||||||
|
let
|
||||||
|
job-flake-update = repo: writePureShellScriptBin "job-flake-update-${repo}" [ action-flake-update-pr-clan ] ''
|
||||||
|
export REPO="gitea@git.clan.lol:clan/${repo}.git"
|
||||||
|
export KEEP_VARS="REPO''${KEEP_VARS:+ $KEEP_VARS}"
|
||||||
|
|
||||||
|
action-flake-update-pr-clan
|
||||||
|
'';
|
||||||
|
in
|
||||||
|
{
|
||||||
|
job-flake-update-clan-core = job-flake-update "clan-core";
|
||||||
|
job-flake-update-clan-homepage = job-flake-update "clan-homepage";
|
||||||
|
job-flake-update-clan-infra = job-flake-update "clan-infra";
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user