From 72c49964338a85f7ae6f92b50828ffbe0f3614ca Mon Sep 17 00:00:00 2001
From: Sandi Fatic <sandi@tenzen.io>
Date: Tue, 26 May 2020 19:22:08 +0100
Subject: [PATCH] Revert "fix(script): fix release build fails of current
 nightly rust" (#2728)

Reverts nearprotocol/nearcore#2704
---
 .github/workflows/mac_binary.yml |  4 ++--
 Dockerfile                       |  8 +++-----
 Makefile                         | 10 +++++-----
 scripts/binary-release.sh        | 13 ++++---------
 4 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/mac_binary.yml b/.github/workflows/mac_binary.yml
index b4c8a10cd27..b73c3a5b365 100644
--- a/.github/workflows/mac_binary.yml
+++ b/.github/workflows/mac_binary.yml
@@ -5,7 +5,7 @@ on:
       - master
       - beta
       - stable
-      - workaround-release-build
+      - mac-binary-release
 jobs:
   build_binary:
     runs-on: macOS-latest
@@ -13,7 +13,7 @@ jobs:
     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/action-aws-cli@v1.1
     - run: scripts/binary-release.sh
diff --git a/Dockerfile b/Dockerfile
index 52960b172d3..83b715950ef 100644
--- a/Dockerfile
+++ b/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
 
diff --git a/Makefile b/Makefile
index fc0e4fdf119..6a36eca8160 100644
--- a/Makefile
+++ b/Makefile
@@ -3,11 +3,11 @@ 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
@@ -15,4 +15,4 @@ debug:
 	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
diff --git a/scripts/binary-release.sh b/scripts/binary-release.sh
index 57d60490119..51c8ca075be 100755
--- a/scripts/binary-release.sh
+++ b/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