Revert "fix(script): fix release build fails of current nightly rust" (…

…#2728)

Reverts #2704

.github/workflows/mac_binary.yml

@@ -5,15 +5,15 @@ on:
       - master
       - beta
       - stable
-      - workaround-release-build
+      - mac-binary-release
 jobs:
   build_binary:
     runs-on: macOS-latest
 
     steps:
     - uses: hecrj/setup-rust-action@v1
       with:
-        rust-version: nightly-2020-05-15
+        rust-version: nightly-2020-03-19
     - uses: actions/checkout@master
     - uses: chrislennon/[email protected]
     - run: scripts/binary-release.sh

Dockerfile

@@ -33,13 +33,11 @@ RUN --mount=type=cache,target=/tmp/target \
     --mount=type=cache,target=/usr/local/cargo/git \
     --mount=type=cache,target=/usr/local/cargo/registry \
     cargo build -p neard --release && \
-    cargo build -p keypair-generator && \
-    cargo build -p genesis-csv-to-json && \
+    cargo build -p keypair-generator --release && \
+    cargo build -p genesis-csv-to-json --release && \
     mkdir /tmp/build && \
     cd /tmp/target/release && \
-    mv ./near ./neard /tmp/build && \
-    cd /tmp/target/debug && \
-    mv ./genesis-csv-to-json ./keypair-generator /tmp/build
+    mv ./near ./keypair-generator ./genesis-csv-to-json /tmp/build
 
 COPY scripts/run_docker.sh /tmp/build/run.sh
 

Makefile

@@ -3,16 +3,16 @@ docker-nearcore:
 
 release:
 	cargo build -p neard --release
-	cargo build -p keypair-generator
-	cargo build -p genesis-csv-to-json
+	cargo build -p keypair-generator --release
+	cargo build -p genesis-csv-to-json --release
 	cargo build -p near-vm-runner-standalone --release
-	cargo build -p state-viewer
-	cargo build -p store-validator-bin
+	cargo build -p state-viewer --release
+	cargo build -p store-validator --release
 
 debug:
 	cargo build -p neard
 	cargo build -p keypair-generator
 	cargo build -p genesis-csv-to-json
 	cargo build -p near-vm-runner-standalone
 	cargo build -p state-viewer
-	cargo build -p store-validator-bin
+	cargo build -p store-validator

scripts/binary-release.sh

@@ -15,14 +15,9 @@ function upload_binary {
     aws s3 cp --acl public-read target/release/$1 s3://build.nearprotocol.com/nearcore/${os}/${branch}/${commit}/$1
 }
 
-function upload_debug_binary {
-    aws s3 cp --acl public-read target/debug/$1 s3://build.nearprotocol.com/nearcore/${os}/${branch}/$1
-    aws s3 cp --acl public-read target/debug/$1 s3://build.nearprotocol.com/nearcore/${os}/${branch}/${commit}/$1
-}
-
 upload_binary near
-upload_debug_binary keypair-generator
-upload_debug_binary genesis-csv-to-json
+upload_binary keypair-generator
+upload_binary genesis-csv-to-json
 upload_binary near-vm-runner-standalone
-upload_debug_binary state-viewer
-upload_debug_binary store-validator-bin
+upload_binary state-viewer
+upload_binary store-validator