Skip to content

Fix CI to check that generation script has run #145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 12, 2020
Merged

Fix CI to check that generation script has run #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92f3f7a
Fix CI to check that generation script has run
Gabriella439 Sep 11, 2020
ae82ae3
Fix evaluation errors
Gabriella439 Sep 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 30 additions & 5 deletions nix/nixpkgs.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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="."; } ''
Expand All @@ -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
Expand Down
4 changes: 3 additions & 1 deletion release.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ let
# master in).
rev = pkgs.runCommand "rev" {} ''echo "${src.rev}" > $out'';
} // builtins.removeAttrs pkgs.dhall-kubernetes
[ "override" "overrideDerivation" ];
[ "override" "overrideDerivation" ]
// builtins.removeAttrs pkgs.dhall-kubernetes-tests
[ "override-test" "overrideDerivation-test" ];

dhall-kubernetes = pkgs.releaseTools.aggregate {
name = "dhall-kubernetes-aggregate";
Expand Down