updating scripts

ikatson · Aug 27, 2024 · d9257ff · d9257ff
1 parent 3370621
commit d9257ff
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 16 deletions.
diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml
@@ -71,6 +71,7 @@ jobs:
         with:
           push: true
           tags: ikatson/rqbit:${{ github.ref_name }}
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          # platforms: linux/amd64,linux/arm64,linux/arm/v7
+          platforms: linux/arm/v7
           context: target/cross/
           file: docker/Dockerfile
diff --git a/docker/Dockerfile.xx b/docker/Dockerfile.xx
@@ -18,21 +18,25 @@ ENV PROFILE_FOLDER=debug
 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 \
-         /usr/local/cargo/git/db \
-         /usr/local/cargo/registry/cache \
-         /usr/local/cargo/registry/index \
-         -maxdepth 2 -type d && \
-    xx-cargo build \
-        --target-dir "target/$(xx-cargo --print-target-triple)" \
-        --profile "${PROFILE_NAME}" \
-        --no-default-features --features rust-tls,webui && \
-    find /src/target -maxdepth 4 -type d && \
-    export BIN="./target/$(xx-cargo --print-target-triple)/$(xx-cargo --print-target-triple)/${PROFILE_FOLDER}/rqbit" && \
-    xx-verify --static "${BIN}" && \
-    find /src/target -maxdepth 4 -type d && \
-    mv "${BIN}" /bin/rqbit
+    --mount=type=cache,target=/src/target <<EOF
+set -e
+export TT="$(xx-cargo --print-target-triple)"
+export BIN="./target/${TT}/${TT}/${PROFILE_FOLDER}/rqbit"
+
+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 \
+    --target-dir "target/${TT}" \
+    --profile "${PROFILE_NAME}" \
+    --no-default-features --features rust-tls,webui
+find /src/target -maxdepth 4 -type d
+xx-verify --static "${BIN}"
+find /src/target -maxdepth 4 -type d
+mv "${BIN}" /bin/rqbit
+EOF
 
 FROM scratch