Skip to content

Commit

Permalink
fix: flake file clean up and ci fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@rtetley
rtetley committed Nov 22, 2024
1 parent 0454b11 commit 0f0f29b
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 30 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest]
coq: [coq-8-18, coq-8-19, coq-master]
coq: [8-18, 8-19, 8-20, master]
profile: [dev, fatalwarnings]
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -53,11 +53,11 @@ jobs:
diff new_yarn.nix yarn.nix
diff goal-view-ui/new_yarn.nix goal-view-ui/yarn.nix
diff search-ui/new_yarn.nix search-ui/yarn.nix
- run: nix develop .#vscoq-language-server-${{ matrix.coq }} -c bash -c "cd language-server && dune build --profile ${{ matrix.profile }}"
- run: nix develop .#vscoq-client -c bash -c "cd client && yarn run install:all && yarn run build:all && yarn run compile"
- run: xvfb-run nix develop .#vscoq-client -c bash -c "cd client && yarn test"
- run: nix develop .#vscoq-${{ matrix.coq }} -c bash -c "cd language-server && dune build --profile ${{ matrix.profile }}"
- run: nix develop .#vscoq-${{ matrix.coq }} -c bash -c "cd client && yarn run install:all && yarn run build:all && yarn run compile"
- run: xvfb-run nix develop .#vscoq-${{ matrix.coq }} -c bash -c "cd client && yarn test"
if: runner.os == 'Linux'
- run: nix develop .#vscoq-client -c bash -c "cd client && yarn test"
- run: nix develop .#vscoq-${{ matrix.coq }} -c bash -c "cd client && yarn test"
if: runner.os != 'Linux'
- if: ${{ failure() }}
run: cat /tmp/vscoq_init_log.*
Expand All @@ -68,7 +68,7 @@ jobs:
matrix:
os: [ubuntu-latest]
ocaml-compiler: [4.14.x]
coq: [8.18.0, 8.19.0, 8.20+rc1, dev]
coq: [8.18.0, 8.19.0, 8.20.0, dev]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout
Expand Down
58 changes: 34 additions & 24 deletions flake.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
formatter = nixpkgs.legacyPackages.${system}.alejandra;

packages = {
default = self.packages.${system}.vscoq-language-server-coq-8-19;
default = self.packages.${system}.vscoq-language-server-coq-8-20;

vscoq-language-server-coq-8-18 =
# Notice the reference to nixpkgs here.
Expand All @@ -52,9 +52,8 @@
gnome.adwaita-icon-theme
wrapGAppsHook
ocaml
yojson
zarith
findlib
yojson
ppx_inline_test
ppx_assert
ppx_sexp_conv
Expand All @@ -66,6 +65,10 @@
lsp
sel
]);
propagatedBuildInputs= (with coq.ocamlPackages;
[
zarith
]);
};

vscoq-language-server-coq-8-19 =
Expand Down Expand Up @@ -93,7 +96,6 @@
wrapGAppsHook
ocaml
yojson
zarith
findlib
ppx_inline_test
ppx_assert
Expand All @@ -106,6 +108,10 @@
lsp
sel
]);
propagatedBuildInputs= (with coq.ocamlPackages;
[
zarith
]);
};

vscoq-language-server-coq-8-20 =
Expand Down Expand Up @@ -133,7 +139,6 @@
wrapGAppsHook
ocaml
yojson
zarith
findlib
ppx_inline_test
ppx_assert
Expand All @@ -146,6 +151,10 @@
lsp
sel
]);
propagatedBuildInputs= (with coq.ocamlPackages;
[
zarith
]);
};

vscoq-language-server-coq-master =
Expand Down Expand Up @@ -173,7 +182,6 @@
wrapGAppsHook
ocaml
yojson
zarith
findlib
ppx_inline_test
ppx_assert
Expand All @@ -186,6 +194,10 @@
lsp
sel
]);
propagatedBuildInputs= (with coq.ocamlPackages;
[
zarith
]);
};

vscoq-client = with import nixpkgs {inherit system;}; let
Expand Down Expand Up @@ -267,53 +279,50 @@
};

devShells = {
vscoq-client = with import nixpkgs {inherit system;};
mkShell {
buildInputs = self.packages.${system}.vscoq-client.extension.buildInputs;
};

vscoq-language-server-coq-8-18 = with import nixpkgs {inherit system;}; let
ocamlPackages = ocaml-ng.ocamlPackages_4_14;
in
vscoq-8-18 = with import nixpkgs {inherit system;};
mkShell {
buildInputs =
self.packages.${system}.vscoq-language-server-coq-8-18.buildInputs
buildInputs =
self.packages.${system}.vscoq-client.extension.buildInputs
++ self.packages.${system}.vscoq-language-server-coq-8-18.buildInputs
++ (with ocamlPackages; [
ocaml-lsp
])
++ ([git]);
};

vscoq-language-server-coq-8-19 = with import nixpkgs {inherit system;}; let
vscoq-8-19 = with import nixpkgs {inherit system;}; let
ocamlPackages = ocaml-ng.ocamlPackages_4_14;
in
mkShell {
buildInputs =
self.packages.${system}.vscoq-language-server-coq-8-19.buildInputs
self.packages.${system}.vscoq-client.extension.buildInputs
++ self.packages.${system}.vscoq-language-server-coq-8-19.buildInputs
++ (with ocamlPackages; [
ocaml-lsp
])
++ ([git]);
};

vscoq-language-server-coq-8-20 = with import nixpkgs {inherit system;}; let
vscoq-8-20 = with import nixpkgs {inherit system;}; let
ocamlPackages = ocaml-ng.ocamlPackages_4_14;
in
mkShell {
buildInputs =
self.packages.${system}.vscoq-language-server-coq-8-20.buildInputs
self.packages.${system}.vscoq-client.extension.buildInputs
++ self.packages.${system}.vscoq-language-server-coq-8-20.buildInputs
++ (with ocamlPackages; [
ocaml-lsp
])
++ ([git]);
};

vscoq-language-server-coq-master = with import nixpkgs {inherit system;}; let
vscoq-master = with import nixpkgs {inherit system;}; let
ocamlPackages = ocaml-ng.ocamlPackages_4_14;
in
mkShell {
buildInputs =
self.packages.${system}.vscoq-language-server-coq-master.buildInputs
self.packages.${system}.vscoq-client.extension.buildInputs
++ self.packages.${system}.vscoq-language-server-coq-master.buildInputs
++ (with ocamlPackages; [
ocaml-lsp
])
Expand All @@ -325,7 +334,8 @@
in
mkShell {
buildInputs =
self.packages.${system}.vscoq-language-server-coq-8-19.buildInputs
self.packages.${system}.vscoq-client.extension.buildInputs
++ self.packages.${system}.vscoq-language-server-coq-8-20.buildInputs
++ (with ocamlPackages; [
ocaml-lsp
])
Expand Down

0 comments on commit 0f0f29b

Please sign in to comment.