dhall-lang/dhall-kubernetes
1
1
Fork 0
mirror of https://github.com/dhall-lang/dhall-kubernetes.git synced 2024-08-14 16:30:28 +03:00
Code Issues Projects Releases Wiki Activity

Fix CI to check that generation script has run

Browse Source 
… based on the discussion in #138

CI wasn't checking that the `./scripts/generate.sh` script had been
run, which this change fixes
This commit is contained in:
Gabriel Gonzalez 2020-09-10 19:21:52 -07:00
parent ad3369f9f9
commit d4272b6b43
2 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
nix/nixpkgs.nix
View File

@ -88,7 +88,7 @@ let
in
''echo './${inputFile} → ./${outputFile}'
${pkgsNew.dhall-json}/bin/dhall-to-yaml --file $out/${inputFile} > $out/${outputFile}
'';
'';
in
pkgsNew.runCommand "package-${drv.name}" { XDG_CACHE_HOME="."; } ''
@ -106,15 +106,40 @@ let
outputFile = "README.md";
in
pkgsNew.lib.optionalString (version == preferredVersion)
''echo './${inputFile} → ./${outputFile}'
${pkgsNew.dhall}/bin/dhall text --file $out/${inputFile} | ${pkgsNew.gnused}/bin/sed 's_\.\./package.dhall_https://raw.githubusercontent.com/dhall-lang/dhall-kubernetes/master/package.dhall_g' > $out/${outputFile}
''
if (version == preferredVersion)
then
''echo './${inputFile} → ./${outputFile}'
${pkgsNew.dhall}/bin/dhall text --file $out/${inputFile} | ${pkgsNew.gnused}/bin/sed 's_\.\./package.dhall_https://raw.githubusercontent.com/dhall-lang/dhall-kubernetes/master/package.dhall_g' > $out/${outputFile}
''
else
''
${pkgsNew.coreutils}/bin/rm --recursive $out/examples
''
}
${pkgsNew.coreutils}/bin/rm --recursive $out/docs
'';
dhall-kubernetes = pkgsNew.callPackage ./dhall-kubernetes.nix {};
dhall-kubernetes-tests =
let
process = version: derivation: {
name = "${version}-test";
value =
pkgsNew.runCommand "test-dhall-kubernetes-${version}" {} ''
${pkgsNew.rsync}/bin/rsync --archive ${derivation}/ ./${version}.expected
${pkgsNew.rsync}/bin/rsync --archive ${../. + "/${version}"}/ ./${version}.actual
${pkgsNew.diffutils}/bin/diff --recursive ./${version}.{actual,expected}
touch $out
'';
};
in
pkgsNew.lib.mapAttrs' process pkgsNew.dhall-kubernetes;
haskellPackages = pkgsOld.haskellPackages.override (old: {
overrides =
let
@ -123,14 +148,7 @@ let
extension = haskellPackagesNew: haskellPackagesOld: {
dhall-openapi =
let
json =
builtins.fromJSON (builtins.readFile ./dhall-haskell.json);
dhall-haskell = pkgsNew.fetchFromGitHub {
owner = "dhall-lang";
repo = "dhall-haskell";
inherit (json) rev sha256 fetchSubmodules;
};
dhall-haskell = ~/proj/dhall-haskell;
in
(import "${dhall-haskell}/default.nix").dhall-openapi;

3
release.nix
View File

@ -12,7 +12,8 @@ let
# master in).
rev = pkgs.runCommand "rev" {} ''echo "${src.rev}" > $out'';
} // builtins.removeAttrs pkgs.dhall-kubernetes
[ "override" "overrideDerivation" ];
[ "override" "overrideDerivation" ]
// pkgs.dhall-kubernetes-tests;
dhall-kubernetes = pkgs.releaseTools.aggregate {
name = "dhall-kubernetes-aggregate";