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

Fix CI for new repository structure

Browse Source
This commit is contained in:
Grégoire Henry 2017-11-27 06:13:12 +01:00 committed by Benjamin Canou
parent 82857dcb94
commit d3f91f05a2
6 changed files with 47 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@ -144,10 +144,10 @@ test:multinode.sh:
- jbuilder build @test/runtest_multinode.sh - jbuilder build @test/runtest_multinode.sh
retry: 1 retry: 1
test:proto:sandboxing: test:proto:sandbox:
<<: *test_definition <<: *test_definition
script: script:
- jbuilder build @src/proto/runtest_sandboxing - jbuilder build @runtest_sandbox
## Publishing (small) docker images with tezos binaries ## Publishing (small) docker images with tezos binaries

6
scripts/Dockerfile.build.in
View File

@ -1,10 +1,6 @@
FROM $base_image FROM $base_image
COPY src tezos/src COPY . tezos
COPY test tezos/test
COPY scripts tezos/scripts
COPY vendors tezos/vendors
COPY Makefile jbuild .ocp-indent tezos/
RUN sudo chown -R opam /home/opam/tezos && \ RUN sudo chown -R opam /home/opam/tezos && \
cd tezos && \ cd tezos && \

2
scripts/Dockerfile.build_deps.in
View File

@ -1,7 +1,7 @@
FROM $base_image FROM $base_image
COPY scripts/install_build_deps.sh scripts/version.sh tezos/scripts/ COPY scripts/install_build_deps.sh scripts/version.sh tezos/scripts/
COPY tezos.opam tezos/ COPY tezos-deps.opam tezos/
RUN sudo apk update && \ RUN sudo apk update && \
opam config exec -- ./tezos/scripts/install_build_deps.sh && \ opam config exec -- ./tezos/scripts/install_build_deps.sh && \
opam install ocp-indent && \ opam install ocp-indent && \

6
scripts/alphanet_constants.patch
View File

@ -1,7 +1,7 @@
diff --git a/src/proto/alpha/constants_repr.ml b/src/proto/alpha/constants_repr.ml diff --git a/lib_embedded_protocol_alpha/src/constants_repr.ml b/lib_embedded_protocol_alpha/src/constants_repr.ml
index 61e79c8a..f91ce282 100644 index 61e79c8a..f91ce282 100644
--- a/src/proto/alpha/constants_repr.ml --- a/lib_embedded_protocol_alpha/src/constants_repr.ml
+++ b/src/proto/alpha/constants_repr.ml +++ b/lib_embedded_protocol_alpha/src/constants_repr.ml
@@ -49,15 +49,14 @@ let read_public_key s = @@ -49,15 +49,14 @@ let read_public_key s =
Ed25519.Public_key.of_bytes (Bytes.of_string (Hex_encode.hex_decode s)) Ed25519.Public_key.of_bytes (Bytes.of_string (Hex_encode.hex_decode s))

8
scripts/install_build_deps.sh
View File

@ -20,10 +20,10 @@ opam pin --yes add --no-action --dev-repo sodium
opam pin --yes add --no-action --dev-repo ocp-ocamlres opam pin --yes add --no-action --dev-repo ocp-ocamlres
opam pin --yes add --no-action --dev-repo ocplib-json-typed opam pin --yes add --no-action --dev-repo ocplib-json-typed
## Force opam to take account of the new `tezos-deps.opam` ## Force opam to take account of the new `tezos-deps.opam`
opam pin --yes remove tezos opam pin --yes remove tezos-deps
opam pin --yes add --no-action tezos $src_dir opam pin --yes add --no-action tezos-deps $src_dir
opam list --installed depext || opam install depext opam list --installed depext || opam install depext
opam depext tezos opam depext tezos-deps
opam install tezos --deps-only opam install tezos-deps --deps-only

36
tezos-deps.opam Normal file
View File

@ -0,0 +1,36 @@
opam-version: "1.2"
version: "dev"
maintainer: "contact@tezos.com"
authors: [ "Tezos devteam" ]
homepage: "https://www.tezos.com/"
bug-reports: "https://gitlab.com/tezos/tezos/issues"
dev-repo: "https://gitlab.com/tezos/tezos.git"
license: "unreleased"
depends: [
"ocamlfind" { build }
"jbuilder" { build & >= "1.0+beta15" }
"base-bigarray"
"base-threads"
"conf-libev"
"calendar"
"cohttp" { >= "0.21" }
"conduit"
"ezjsonm" { >= "0.5.0" }
"git"
"git-unix"
"irmin" { >= "1.3" }
"irmin-unix" { >= "1.3" }
"lwt" { >= "3.0.0" }
"lwt_ssl"
"menhir"
"mtime" { >= "1.0.0" }
"ocp-ocamlres" { >= "dev" }
"ocplib-endian"
"ocplib-json-typed"
"reactiveData"
"sodium" { >= "0.3.0" }
"magic-mime"
"leveldb" { >= "1.1.2" }
"kaputt" # { test }
"bisect_ppx" # { test }
]