diff --git a/Makefile b/Makefile index 8c9b23cbc..f04a6bd57 100644 --- a/Makefile +++ b/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) diff --git a/scripts/version.sh b/scripts/version.sh index 593869d37..66013c6af 100644 --- a/scripts/version.sh +++ b/scripts/version.sh @@ -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