Skip to content
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.

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

Use fake opam package pinned_libs.opam to pin libs for builds #690

Merged
merged 1 commit into from
Mar 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 15 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ jobs:
texlive-latex-extra
opam depext --install --yes dune odoc camlp-streams \
${{ matrix.additional-packages }}
opam install --yes . --deps-only --locked
cd pinned_libs/default
opam install --yes . --deps-only
cd ../..
- name: Make Kappa
run: opam exec -- make all
- name: Make documentation
Expand Down Expand Up @@ -59,8 +61,9 @@ jobs:
sudo apt-get install --yes gnuplot-nox \
poppler-utils graphviz texlive-latex-recommended \
texlive-fonts-recommended texlive-pictures tex4ht
opam install --yes dune
opam install --yes . --deps-only --locked
cd pinned_libs/default
opam install --yes . --deps-only
cd ../..
pip install nose
- name: Make Kappa
run: |
Expand Down Expand Up @@ -90,8 +93,9 @@ jobs:
texlive-fonts-recommended texlive-pictures tex4ht
- name: Install OPAM dependencies
run: |
opam install --yes dune
opam install --yes . --deps-only --locked
cd pinned_libs/default
opam install --yes . --deps-only
cd ../..
- name: Make Kappa
run: opam exec -- make all
- name: Make Javascript app
Expand Down Expand Up @@ -120,8 +124,9 @@ jobs:
ocaml-compiler: 4.13.x
- name: Install OPAM dependencies
run: |
opam install --yes dune
opam install --yes . --deps-only --locked
cd pinned_libs/default
opam install --yes . --deps-only
cd ../..
- name: Make Kappa
run: opam exec -- make all
- name: Make MacOS app
Expand Down Expand Up @@ -156,10 +161,9 @@ jobs:
ocaml-compiler: 4.14.x
- name: Install OPAM dependencies
run: |
# install unpinned deps as those pinned in .locked are not available
# Note: failure with $opam install --yes . --deps-only
# TODO: specific library pin for windows build (few updates on windows, so low priority)
opam install --yes dune num yojson result lwt fmt logs re lwt_react tyxml-ppx js_of_ocaml-lwt js_of_ocaml-tyxml atdgen result cohttp-lwt-unix
cd pinned_libs/windows
opam install --yes . --deps-only
cd ../..
- name: Make Kappa
run: opam exec -- make all
- name: Make Windows app
Expand Down
51 changes: 0 additions & 51 deletions kappa-agents.opam.locked

This file was deleted.

51 changes: 0 additions & 51 deletions kappa-binaries.opam.locked

This file was deleted.

51 changes: 0 additions & 51 deletions kappa-library.opam.locked

This file was deleted.

50 changes: 0 additions & 50 deletions kappa-server.opam.locked

This file was deleted.

57 changes: 0 additions & 57 deletions kappa-webapp.opam.locked

This file was deleted.

27 changes: 27 additions & 0 deletions pinned_libs/default/pinned_libs.opam
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
opam-version: "2.0"
name: "pinned_libs"
version: "4.1~dev"
synopsis: "Pinned libs for the Kappa tool suite"
maintainer: [
"Antoine Pouille <antoine.a.pouille@inria.fr>"
]
depends: [
"atdgen" {= "2.15.0"}
"atdgen-runtime" {= "2.15.0"}
"cohttp-lwt-unix" {= "5.3.0"}
"dune" {= "3.14.0"}
"fmt" {= "0.9.0"}
"js_of_ocaml" {= "5.7.0"}
"js_of_ocaml-lwt" {= "5.7.0"}
"js_of_ocaml-ppx" {= "5.7.0"}
"js_of_ocaml-tyxml" {= "5.7.0"}
"logs" {= "0.7.0"}
"lwt" {= "5.7.0"}
"lwt_react" {= "1.2.0"}
"num" {= "1.5"}
"re" {= "1.11.0"}
"result" {= "1.5"}
"stdlib-shims" {= "0.3.0"}
"tyxml-ppx" {= "4.6.0"}
"yojson" {= "2.1.0"}
]
27 changes: 27 additions & 0 deletions pinned_libs/windows/pinned_libs.opam
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
opam-version: "2.0"
name: "pinned_libs"
version: "4.1~dev"
synopsis: "Pinned libs for the Kappa tool suite"
maintainer: [
"Antoine Pouille <antoine.a.pouille@inria.fr>"
]
depends: [
"atdgen" {= "2.10.0"}
"atdgen-runtime" {= "2.10.0"}
"cohttp-lwt-unix" {= "5.0.0"}
"dune" {= "3.5.0"}
"fmt" {= "0.9.0"}
"js_of_ocaml" {= "4.0.0"}
"js_of_ocaml-lwt" {= "4.0.0"}
"js_of_ocaml-ppx" {= "4.0.0"}
"js_of_ocaml-tyxml" {= "4.0.0"}
"logs" {= "0.7.0"}
"lwt" {= "5.6.1"}
"lwt_react" {= "1.2.0"}
"num" {= "1.4"}
"re" {= "1.10.4"}
"result" {= "1.5"}
"stdlib-shims" {= "0.3.0"}
"tyxml-ppx" {= "4.5.0"}
"yojson" {= "2.0.2"}
]