fix(release): the resolver = 2 feature is a nightly feature causing t…

…he release builds to fail as we use stable
near · May 27, 2021 · 1dd1331 · 1dd1331
1 parent 4009a14
commit 1dd1331
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,4 @@
 [workspace]
-resolver = "2"
 members = [
     "core/chain-configs",
     "core/crypto",

diff --git a/Dockerfile b/Dockerfile
@@ -29,17 +29,13 @@ COPY . .
 ENV CARGO_TARGET_DIR=/tmp/target
 ENV RUSTC_FLAGS='-C target-cpu=x86-64'
 ENV PORTABLE=ON
-RUN --mount=type=cache,target=/tmp/target \
-    --mount=type=cache,target=/usr/local/cargo/git \
-    --mount=type=cache,target=/usr/local/cargo/registry \
-    cargo +"$(cat /tmp/rust-toolchain)" build -p neard --release && \
+RUN cargo +"$(cat /tmp/rust-toolchain)" build -p neard --release && \
     mkdir /tmp/build && \
     cd /tmp/target/release && \
     mv ./neard /tmp/build
 
 COPY scripts/run_docker.sh /tmp/build/run.sh
 
-
 # Actual image
 FROM ubuntu:18.04
 

diff --git a/Dockerfile.nightly b/Dockerfile.nightly
@@ -29,10 +29,7 @@ COPY . .
 ENV CARGO_TARGET_DIR=/tmp/target
 ENV RUSTC_FLAGS='-C target-cpu=x86-64'
 ENV PORTABLE=ON
-RUN --mount=type=cache,target=/tmp/target \
-    --mount=type=cache,target=/usr/local/cargo/git \
-    --mount=type=cache,target=/usr/local/cargo/registry \
-    cargo +"$(cat /tmp/rust-toolchain)" build -p neard --release --features nightly_protocol --features nightly_protocol_features && \
+RUN cargo +"$(cat /tmp/rust-toolchain)" build -p neard --release --features nightly_protocol --features nightly_protocol_features && \
     mkdir /tmp/build && \
     cd /tmp/target/release && \
     mv ./neard /tmp/build