Makefile accepts all opam 2.0.* versions
This commit is contained in:
parent
608cd52b4d
commit
7a631f5f3c
4
Makefile
4
Makefile
@ -7,8 +7,8 @@ active_protocol_directories := $(shell tr -- - _ < active_protocol_versions)
|
||||
current_opam_version := $(shell opam --version)
|
||||
include scripts/version.sh
|
||||
|
||||
ifneq (${current_opam_version},${opam_version})
|
||||
$(error Unexpected opam version (found: ${current_opam_version}, expected: ${opam_version}))
|
||||
ifeq ($(filter ${opam_version}.%,${current_opam_version}),)
|
||||
$(error Unexpected opam version (found: ${current_opam_version}, expected: ${opam_version}.*))
|
||||
endif
|
||||
|
||||
current_ocaml_version := $(shell opam exec -- ocamlc -version)
|
||||
|
@ -4,7 +4,7 @@
|
||||
## `lib.protocol-compiler/tezos-protocol-compiler.opam`
|
||||
|
||||
ocaml_version=4.06.1
|
||||
opam_version=2.0.0
|
||||
opam_version=2.0
|
||||
|
||||
## Please update `.gitlab-ci.yml` accordingly
|
||||
opam_repository_tag=4200cbebcae75562d79898a8e11e9f4dc237cc08
|
||||
|
Loading…
Reference in New Issue
Block a user