Skip to content

Commit

Permalink
update isla-lang dependency via pin-depends
Browse files Browse the repository at this point in the history
  • Loading branch information
MackieLoeffel committed Apr 18, 2024
1 parent 5187877 commit 1ab5847
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

env:
OCAML: "ocaml-variants.4.14.0+options ocaml-option-flambda"
OPAM_PINS: "coq version 8.19.0 isla-lang git git+https://github.com/rems-project/isla-lang.git"
OPAM_PINS: "coq version 8.19.0"
CPU_CORES: "1"
DENY_WARNINGS: "1"
CI_RUNNER: "dummy"
Expand Down
6 changes: 3 additions & 3 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ variables:
build-coq.8.19.0-timing:
<<: *template
variables:
OPAM_PINS: "coq version 8.19.0 isla-lang git git+https://github.com/rems-project/isla-lang.git#309be26729b511570e2d31f69c6ba1ce1dc00779"
OPAM_PINS: "coq version 8.19.0"
DENY_WARNINGS: "1"
# OPAM_PKG: "1"
only:
Expand All @@ -46,15 +46,15 @@ build-coq.8.19.0-timing:
build-coq.8.19.0:
<<: *template
variables:
OPAM_PINS: "coq version 8.19.0 isla-lang git git+https://github.com/rems-project/isla-lang.git#309be26729b511570e2d31f69c6ba1ce1dc00779"
OPAM_PINS: "coq version 8.19.0"
DENY_WARNINGS: "1"
only:
- /^ci/@iris/isla-coq

trigger-iris.dev:
<<: *template
variables:
OPAM_PINS: "coq version 8.19.0 coq-stdpp.dev git git+https://gitlab.mpi-sws.org/iris/stdpp.git#$STDPP_REV coq-iris.dev git git+https://gitlab.mpi-sws.org/iris/iris.git#$IRIS_REV isla-lang git git+https://github.com/rems-project/isla-lang.git#309be26729b511570e2d31f69c6ba1ce1dc00779"
OPAM_PINS: "coq version 8.19.0 coq-stdpp.dev git git+https://gitlab.mpi-sws.org/iris/stdpp.git#$STDPP_REV coq-iris.dev git git+https://gitlab.mpi-sws.org/iris/iris.git#$IRIS_REV"
except:
only:
- triggers
Expand Down
5 changes: 2 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ strip_license:

# We cannot use builddep-pins as a dependency of builddep-opamfiles because the CI removes all pins.
builddep-pins:
@opam pin add -n -y isla-lang "git+https://github.com/rems-project/isla-lang.git#309be26729b511570e2d31f69c6ba1ce1dc00779"
@true
.PHONY: builddep-pins

builddep-opamfiles: builddep/islaris-builddep.opam
Expand All @@ -122,10 +122,9 @@ builddep/islaris-builddep.opam: islaris.opam Makefile
# 1) dependencies of Islaris are installed,
# 2) they will remain satisfied even if other packages are updated/installed,
# 3) we do not have to pin the Islaris package itself (which takes time).
# Note: We also need to install isla-lang to make sure that new pins are propagated correctly.
builddep: builddep/islaris-builddep.opam builddep-pins
@echo "# Installing package $<."
@opam install $(OPAMFLAGS) $< isla-lang
@opam install $(OPAMFLAGS) $<
.PHONY: builddep

saildep:
Expand Down
4 changes: 4 additions & 0 deletions islaris.opam
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ depends: [
"isla-lang"
]

pin-depends: [
[ "isla-lang.dev" "git+https://github.com/rems-project/isla-lang.git#6a1d25dc35a7f3c8442b61bfed3cca38f958f49f" ]
]

build: [
["dune" "subst"] {pinned}
["dune" "build" "-p" name "-j" jobs]
Expand Down

0 comments on commit 1ab5847

Please sign in to comment.