balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Makefile accepts all opam 2.0.* versions

Browse Source
This commit is contained in:
Pierre Boutillier 2018-11-06 15:17:10 +01:00 committed by Grégoire Henry
parent 608cd52b4d
commit 7a631f5f3c
No known key found for this signature in database
GPG Key ID: 50D984F20BD445D2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -7,8 +7,8 @@ active_protocol_directories := $(shell tr -- - _ < active_protocol_versions)
current_opam_version := $(shell opam --version) current_opam_version := $(shell opam --version)
include scripts/version.sh include scripts/version.sh
ifneq (${current_opam_version},${opam_version}) ifeq ($(filter ${opam_version}.%,${current_opam_version}),)
$(error Unexpected opam version (found: ${current_opam_version}, expected: ${opam_version})) $(error Unexpected opam version (found: ${current_opam_version}, expected: ${opam_version}.*))
endif endif
current_ocaml_version := $(shell opam exec -- ocamlc -version) current_ocaml_version := $(shell opam exec -- ocamlc -version)

2
scripts/version.sh
View File

@ -4,7 +4,7 @@
## `lib.protocol-compiler/tezos-protocol-compiler.opam` ## `lib.protocol-compiler/tezos-protocol-compiler.opam`
ocaml_version=4.06.1 ocaml_version=4.06.1
opam_version=2.0.0 opam_version=2.0
## Please update `.gitlab-ci.yml` accordingly ## Please update `.gitlab-ci.yml` accordingly
opam_repository_tag=4200cbebcae75562d79898a8e11e9f4dc237cc08 opam_repository_tag=4200cbebcae75562d79898a8e11e9f4dc237cc08