Skip to content

Commit efb7458

Browse files
authored
Fix CI to check that generation script has run (#145)
… based on the discussion in #138 CI wasn't checking that the `./scripts/generate.sh` script had been run, which this change fixes
1 parent ad3369f commit efb7458

File tree

2 files changed

+33
-6
lines changed

2 files changed

+33
-6
lines changed

nix/nixpkgs.nix

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ let
8888
in
8989
''echo './${inputFile} → ./${outputFile}'
9090
${pkgsNew.dhall-json}/bin/dhall-to-yaml --file $out/${inputFile} > $out/${outputFile}
91-
'';
91+
'';
9292

9393
in
9494
pkgsNew.runCommand "package-${drv.name}" { XDG_CACHE_HOME="."; } ''
@@ -106,15 +106,40 @@ let
106106
outputFile = "README.md";
107107
108108
in
109-
pkgsNew.lib.optionalString (version == preferredVersion)
110-
''echo './${inputFile} → ./${outputFile}'
111-
${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}
112-
''
109+
if (version == preferredVersion)
110+
then
111+
''echo './${inputFile} → ./${outputFile}'
112+
113+
${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}
114+
''
115+
else
116+
''
117+
${pkgsNew.coreutils}/bin/rm --recursive $out/examples
118+
''
113119
}
120+
${pkgsNew.coreutils}/bin/rm --recursive $out/docs
114121
'';
115122

116123
dhall-kubernetes = pkgsNew.callPackage ./dhall-kubernetes.nix {};
117124

125+
dhall-kubernetes-tests =
126+
let
127+
process = version: derivation: {
128+
name = "${version}-test";
129+
value =
130+
pkgsNew.runCommand "test-dhall-kubernetes-${version}" {} ''
131+
${pkgsNew.rsync}/bin/rsync --archive ${derivation}/ ./${version}.expected
132+
${pkgsNew.rsync}/bin/rsync --archive ${../. + "/${version}"}/ ./${version}.actual
133+
134+
${pkgsNew.diffutils}/bin/diff --recursive ./${version}.{actual,expected}
135+
136+
touch $out
137+
'';
138+
};
139+
140+
in
141+
pkgsNew.lib.mapAttrs' process pkgsNew.dhall-kubernetes;
142+
118143
haskellPackages = pkgsOld.haskellPackages.override (old: {
119144
overrides =
120145
let

release.nix

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ let
1212
# master in).
1313
rev = pkgs.runCommand "rev" {} ''echo "${src.rev}" > $out'';
1414
} // builtins.removeAttrs pkgs.dhall-kubernetes
15-
[ "override" "overrideDerivation" ];
15+
[ "override" "overrideDerivation" ]
16+
// builtins.removeAttrs pkgs.dhall-kubernetes-tests
17+
[ "override-test" "overrideDerivation-test" ];
1618

1719
dhall-kubernetes = pkgs.releaseTools.aggregate {
1820
name = "dhall-kubernetes-aggregate";

0 commit comments

Comments
 (0)