messing

ikatson · Aug 27, 2024 · fbf74c2 · fbf74c2
1 parent a678720
commit fbf74c2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml
@@ -22,7 +22,7 @@ jobs:
             usr-local-cargo-registry-cache
             usr-local-cargo-registry-index
             src-target
-          key: docker-xx
+          key: docker-xx-v0
 
       - name: inject cache into docker
         uses: reproducible-containers/[email protected]

diff --git a/docker/Dockerfile.xx b/docker/Dockerfile.xx
@@ -12,22 +12,17 @@ RUN xx-apk add gcc musl-dev
 COPY / /src/
 WORKDIR /src/
 
-RUN --mount=type=cache,target=/usr/local/cargo/git/db \
-    --mount=type=cache,target=/usr/local/cargo/registry/cache \
-    --mount=type=cache,target=/usr/local/cargo/registry/index \
-    find /usr/local/cargo/git/db \
-         /usr/local/cargo/registry/cache \
-         /usr/local/cargo/registry/index \
-         -maxdepth 2 -type d && \
-    cargo fetch
-
 ENV PROFILE=release-github
 
 RUN --mount=type=cache,target=/usr/local/cargo/git/db \
     --mount=type=cache,target=/usr/local/cargo/registry/cache \
     --mount=type=cache,target=/usr/local/cargo/registry/index \
     --mount=type=cache,target=/src/target \
-    find /src/target -maxdepth 2 -type d && \
+    find /src/target \
+         /usr/local/cargo/git/db \
+         /usr/local/cargo/registry/cache \
+         /usr/local/cargo/registry/index \
+         -maxdepth 2 -type d && \
     xx-cargo build --profile "${PROFILE}" --no-default-features --features rust-tls,webui && \
     xx-verify --static "./target/$(xx-cargo --print-target-triple)/${PROFILE}/rqbit" && \
     mv "./target/$(xx-cargo --print-target-triple)/${PROFILE}/rqbit" /bin/rqbit