mirror of
https://gitlab.com/TECHNOFAB/nix-gitlab-ci.git
synced 2025-12-12 02:00:13 +01:00
fix(storeDir) Use the builtin nix store location indicator
Minor fixes in the variable filtering function with nix packages.
This commit is contained in:
parent
58a0db7861
commit
f84edb7760
2 changed files with 2 additions and 2 deletions
|
|
@ -50,7 +50,7 @@ in rec {
|
||||||
filterJobVariables = shouldContain: job:
|
filterJobVariables = shouldContain: job:
|
||||||
concatMapAttrs (
|
concatMapAttrs (
|
||||||
name: value:
|
name: value:
|
||||||
optionalAttrs ((hasInfix "/nix/store/" value) == shouldContain) {
|
optionalAttrs ((hasInfix builtins.storeDir value) == shouldContain) {
|
||||||
${name} = value;
|
${name} = value;
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -178,7 +178,7 @@
|
||||||
# sh
|
# sh
|
||||||
''
|
''
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
${ntlib.helpers.path [pkgs.jq pkgs.gnugrep pkgs.coreutils]}
|
${ntlib.helpers.path (with pkgs; [jq gnugrep coreutils])}
|
||||||
echo "two keys, one json one pretty"
|
echo "two keys, one json one pretty"
|
||||||
jq 'keys | length == 2' "${pipeline}" | grep -q true
|
jq 'keys | length == 2' "${pipeline}" | grep -q true
|
||||||
echo "key[0] is exactly 'gitlab-ci:pipeline:test'"
|
echo "key[0] is exactly 'gitlab-ci:pipeline:test'"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue