nix: move withtmpdb to separate file
Co-authored-by: Remo Rechkemmer <59358383+monacoremo@users.noreply.github.com>
This commit is contained in:
committed by
Wolfgang Walther
co-authored by
Remo Rechkemmer
parent
f99fd6cbad
commit
579a626de2
+4
-1
@@ -112,10 +112,13 @@ rec {
|
|||||||
nixpkgsUpgrade =
|
nixpkgsUpgrade =
|
||||||
pkgs.callPackage nix/nixpkgs-upgrade.nix { };
|
pkgs.callPackage nix/nixpkgs-upgrade.nix { };
|
||||||
|
|
||||||
|
withTmpDb =
|
||||||
|
pkgs.callPackage nix/withtmpdb.nix { };
|
||||||
|
|
||||||
# Scripts for running tests.
|
# Scripts for running tests.
|
||||||
tests =
|
tests =
|
||||||
pkgs.callPackage nix/tests.nix {
|
pkgs.callPackage nix/tests.nix {
|
||||||
inherit postgrest postgrestProfiled postgresqlVersions devCabalOptions;
|
inherit postgrest postgrestProfiled postgresqlVersions devCabalOptions withTmpDb;
|
||||||
ghc = pkgs.haskell.compiler."${compiler}";
|
ghc = pkgs.haskell.compiler."${compiler}";
|
||||||
hpc-codecov = pkgs.haskell.packages."${compiler}".hpc-codecov;
|
hpc-codecov = pkgs.haskell.packages."${compiler}".hpc-codecov;
|
||||||
};
|
};
|
||||||
|
|||||||
+1
-20
@@ -17,29 +17,10 @@
|
|||||||
, postgrestProfiled
|
, postgrestProfiled
|
||||||
, python3
|
, python3
|
||||||
, runtimeShell
|
, runtimeShell
|
||||||
|
, withTmpDb
|
||||||
, yq
|
, yq
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
# Wrap the `test/with_tmp_db` script with the required dependencies from Nix.
|
|
||||||
withTmpDb =
|
|
||||||
postgresql:
|
|
||||||
checkedShellScript
|
|
||||||
{
|
|
||||||
name = "postgrest-test-withtmpdb-${postgresql.name}";
|
|
||||||
docs = "Run the given command in a temporary database";
|
|
||||||
inRootDir = true;
|
|
||||||
}
|
|
||||||
''
|
|
||||||
# avoid starting multiple layers of with_tmp_db
|
|
||||||
if test ! -v PGRST_DB_URI; then
|
|
||||||
export PATH=${postgresql}/bin:"$PATH"
|
|
||||||
|
|
||||||
exec test/with_tmp_db "$@"
|
|
||||||
else
|
|
||||||
"$@"
|
|
||||||
fi
|
|
||||||
'';
|
|
||||||
|
|
||||||
# Create a `withPostgresql` for each PostgreSQL version that we want to test
|
# Create a `withPostgresql` for each PostgreSQL version that we want to test
|
||||||
# against.
|
# against.
|
||||||
withPostgresqlVersions =
|
withPostgresqlVersions =
|
||||||
|
|||||||
@@ -0,0 +1,20 @@
|
|||||||
|
# Wrap the `test/with_tmp_db` script with the required dependencies from Nix.
|
||||||
|
{ checkedShellScript }:
|
||||||
|
|
||||||
|
postgresql:
|
||||||
|
checkedShellScript
|
||||||
|
{
|
||||||
|
name = "postgrest-test-withtmpdb-${postgresql.name}";
|
||||||
|
docs = "Run the given command in a temporary database";
|
||||||
|
inRootDir = true;
|
||||||
|
}
|
||||||
|
''
|
||||||
|
# avoid starting multiple layers of with_tmp_db
|
||||||
|
if test ! -v PGRST_DB_URI; then
|
||||||
|
export PATH=${postgresql}/bin:"$PATH"
|
||||||
|
|
||||||
|
exec test/with_tmp_db "$@"
|
||||||
|
else
|
||||||
|
"$@"
|
||||||
|
fi
|
||||||
|
''
|
||||||
Reference in New Issue
Block a user