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

CI: fix dependency caching

Browse Source
This commit is contained in:
Grégoire Henry 2017-12-05 15:15:36 +01:00 committed by Benjamin Canou
parent 7807f7aa4d
commit a505b54287
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/Dockerfile.build_deps.in
View File

@ -1,7 +1,14 @@
FROM $base_image FROM $base_image
## /!\ /!\ /!\ /!\/!\ /!\ /!\
## /!\ Don't forget fu update the variables 'dependencies' in
## /!\ `create_docker_image.build_deps.sh` when modifyiing the
## /!\ 'COPY'edfiles.
## /!\ /!\ /!\ /!\/!\ /!\ /!\
COPY scripts/install_build_deps.sh scripts/version.sh tezos/scripts/ COPY scripts/install_build_deps.sh scripts/version.sh tezos/scripts/
COPY tezos-deps.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 && \

2
scripts/create_docker_image.build_deps.sh
View File

@ -28,7 +28,7 @@ sed -e 's|$base_image|'"$base_image"'|g' \
scripts/Dockerfile.build_deps.in > Dockerfile scripts/Dockerfile.build_deps.in > Dockerfile
## Lookup for for prebuilt dependencies... ## Lookup for for prebuilt dependencies...
dependencies="scripts/install_build_deps.sh tezos.opam Dockerfile" dependencies="scripts/install_build_deps.sh scripts/version.sh tezos-deps.opam Dockerfile"
dependencies_sha1=$(docker inspect --format="{{ .RootFS.Layers }}" --type=image $base_image | sha1sum - $dependencies | sha1sum | tr -d ' -') dependencies_sha1=$(docker inspect --format="{{ .RootFS.Layers }}" --type=image $base_image | sha1sum - $dependencies | sha1sum | tr -d ' -')
if [ ! -z "$cached_image" ]; then if [ ! -z "$cached_image" ]; then
echo echo