Skip to content

Commit c972555

Browse files
committed
Do more during CI run
1 parent c320d03 commit c972555

File tree

4 files changed

+81
-58
lines changed

4 files changed

+81
-58
lines changed

.github/workflows/cheshire.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: "Cheshire CI"
2+
on:
3+
push:
4+
branches:
5+
- main
6+
7+
jobs:
8+
dev-shell:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@v4
12+
- uses: cachix/install-nix-action@v24
13+
- uses: cachix/cachix-action@v15
14+
with:
15+
name: famisoft
16+
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
17+
- run: nix develop --profile dev-shell -c true
18+
19+
checks:
20+
runs-on: ubuntu-latest
21+
steps:
22+
- uses: actions/checkout@v4
23+
- uses: cachix/install-nix-action@v24
24+
- uses: cachix/cachix-action@v15
25+
with:
26+
name: famisoft
27+
skipPush: true
28+
- run: nix flake check
29+
30+
typecheck:
31+
runs-on: ubuntu-latest
32+
needs: dev-shell
33+
steps:
34+
- uses: actions/checkout@v4
35+
- uses: cachix/install-nix-action@v24
36+
- uses: cachix/cachix-action@v15
37+
with:
38+
name: famisoft
39+
skipPush: true
40+
- run: nix build -L

.github/workflows/dev-shell.yml

Lines changed: 0 additions & 17 deletions
This file was deleted.

flake.nix

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
};
1616

1717
outputs = inputs@{ self, nixpkgs, utils, ... }:
18-
utils.lib.eachDefaultSystem (system:
18+
(utils.lib.eachDefaultSystem (system:
1919
let
2020
pkgs = import nixpkgs {
2121
inherit system;
22-
overlays = [ self.overlays.${system}.default ];
22+
overlays = [ self.overlays.default ];
2323
};
2424
agdaWithLibraries = pkgs.agda.withPackages (p: [
2525
p.standard-library
@@ -37,43 +37,6 @@
3737
installPhase = ''mkdir "$out"'';
3838
};
3939

40-
overlays = rec {
41-
agda = final: prev: {
42-
haskellPackages = prev.haskellPackages.override {
43-
overrides = hfinal: hprev:
44-
let inherit (final.haskell.lib.compose)
45-
addBuildDepends enableCabalFlag overrideSrc;
46-
in {
47-
Agda = final.lib.pipe hprev.Agda [
48-
(overrideSrc {
49-
src = inputs.agda;
50-
version = "2.7.0.1";
51-
})
52-
(addBuildDepends (with hfinal; [pqueue text-icu]))
53-
(enableCabalFlag "enable-cluster-counting")
54-
];
55-
};
56-
};
57-
};
58-
59-
standard-library = final: prev: {
60-
agdaPackages = prev.agdaPackages.overrideScope (
61-
finalAgda: prevAgda: {
62-
standard-library = prevAgda.standard-library.overrideAttrs {
63-
version = "2.1";
64-
src = inputs.std-lib;
65-
};
66-
}
67-
);
68-
};
69-
70-
# pkgs.lib.composeExtensions, but how to get it without infinte recursion?
71-
default = final: prev:
72-
let agda' = agda final prev;
73-
prev' = prev // agda';
74-
in agda' // standard-library final prev';
75-
};
76-
7740
devShells.default = pkgs.mkShell {
7841
buildInputs = [
7942
agdaWithLibraries
@@ -98,5 +61,42 @@
9861
};
9962
};
10063
}
101-
);
64+
)) // {
65+
overlays = rec {
66+
agda = final: prev: {
67+
haskellPackages = prev.haskellPackages.override {
68+
overrides = hfinal: hprev:
69+
let inherit (final.haskell.lib.compose)
70+
addBuildDepends enableCabalFlag overrideSrc;
71+
in {
72+
Agda = final.lib.pipe hprev.Agda [
73+
(overrideSrc {
74+
src = inputs.agda;
75+
version = "2.7.0.1";
76+
})
77+
(addBuildDepends (with hfinal; [pqueue text-icu]))
78+
(enableCabalFlag "enable-cluster-counting")
79+
];
80+
};
81+
};
82+
};
83+
84+
standard-library = final: prev: {
85+
agdaPackages = prev.agdaPackages.overrideScope (
86+
finalAgda: prevAgda: {
87+
standard-library = prevAgda.standard-library.overrideAttrs {
88+
version = "2.1";
89+
src = inputs.std-lib;
90+
};
91+
}
92+
);
93+
};
94+
95+
# pkgs.lib.composeExtensions, but how to get it without infinte recursion?
96+
default = final: prev:
97+
let agda' = agda final prev;
98+
prev' = prev // agda';
99+
in agda' // standard-library final prev';
100+
};
101+
};
102102
}

src/Cheshire/Morphism/Reasoning/Core.agda

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ module Cancellers {h : X ⇒ Y} {i : Y ⇒ X} (inv : h ∘ i ≈ id) where
361361
{f : Y ⇒ Z} {g : W ⇒ Y}
362362
f ∘ g ≈ (f ∘ h) ∘ (i ∘ g)
363363
insertInner = ⟺ cancelInner
364-
364+
365365
open Cancellers public
366366

367367
-- operate in the 'center' instead (like pull/push)

0 commit comments

Comments
 (0)