From 90c33cfd9e43dbb05a5eaab46bfe5c44cdb1daa3 Mon Sep 17 00:00:00 2001 From: Eli Streams Date: Mon, 19 Aug 2024 00:21:00 +0000 Subject: [PATCH] uncomment build cache See merge request aquareum-tv/aquareum!53 Changelog: feature --- .ci/dockerfile-hash.yaml | 2 +- docker/build.Dockerfile | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.ci/dockerfile-hash.yaml b/.ci/dockerfile-hash.yaml index cd16720a8..6b2f1a5bb 100644 --- a/.ci/dockerfile-hash.yaml +++ b/.ci/dockerfile-hash.yaml @@ -1,2 +1,2 @@ variables: - DOCKERFILE_HASH: 12c515a3a32f0d583a6cf197332140674b47533f \ No newline at end of file + DOCKERFILE_HASH: 1cb5af77dcc59720811c22947abfb986ef4cf2b2 \ No newline at end of file diff --git a/docker/build.Dockerfile b/docker/build.Dockerfile index 12c515a3a..1cb5af77d 100644 --- a/docker/build.Dockerfile +++ b/docker/build.Dockerfile @@ -49,7 +49,12 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > rustup.sh \ && rm rustup.sh FROM builder AS cached-builder -# ARG CI_COMMIT_BRANCH=next -# ENV CI_COMMIT_BRANCH $CI_COMMIT_BRANCH -# WORKDIR /cached-build -# RUN git clone https://git.aquareum.tv/aquareum-tv/aquareum && cd aquareum && make all -j$(nproc) && cd .. && rm -rf aquareum +ARG CI_COMMIT_BRANCH=next +ENV CI_COMMIT_BRANCH $CI_COMMIT_BRANCH +WORKDIR /cached-build +RUN git clone https://git.aquareum.tv/aquareum-tv/aquareum \ + && cd aquareum \ + && make version install check app node-all-platforms android -j$(nproc) \ + && make test \ + && cd .. \ + && rm -rf aquareum -- knotmirror 0.0.1