Merge pull request #212 from trezor/fix/build-scripts

Fix/build scripts

.gitlab-ci.yml

@@ -48,11 +48,11 @@ build beta:
 build production:
   stage: build
   script:
-    - yarn run build:prod
+    - yarn run build:stable
   artifacts:
     expire_in: 1 month
     paths:
-      - build/prod
+      - build/stable
 
 # deploy
 deploy review:

Dockerfile

@@ -1,6 +1,6 @@
 FROM node:9.3
 
-ARG BUILD_TYPE=prod
+ARG BUILD_TYPE=stable
 
 WORKDIR /trezor-wallet-app
 

Makefile

@@ -1,5 +1,28 @@
+# Run docker build
+# usage: 
+# make build-beta
+# make build-stable
 build-%:
 	./scripts/docker-build.sh $*
 
-sync-%:
-	./scripts/s3sync.sh $*
+# s3sync with stage.mytrezor.com
+# Upload requested build for testing purposes
+# usage:
+# make stage-beta
+# make stage-stable
+stage-%:
+	./scripts/s3sync.sh stage $*
+
+# s3sync with beta.mytrezor.com
+# Upload build/beta only
+# usage:
+# make beta
+beta:
+	./scripts/s3sync.sh beta beta
+
+# s3sync with wallet.mytrezor.com
+# Upload build/stable only
+# usage:
+# make stable
+stable:
+	./scripts/s3sync.sh stable stable

package.json

@@ -11,7 +11,7 @@
         "dev": "npx webpack-dev-server --config webpack/dev.babel.js",
         "dev:local": "npx webpack-dev-server --config webpack/local.babel.js",
         "build": "rimraf build && run-s build:*",
-        "build:prod": "rimraf build/prod && npx webpack --config webpack/production.babel.js --output-path build/prod --progress --bail",
+        "build:stable": "rimraf build/stable && npx webpack --config webpack/production.babel.js --output-path build/stable --progress --bail",
         "build:beta": "rimraf build/beta && cross-env BUILD=beta npx webpack --config webpack/production.babel.js --output-path build/beta --progress --bail",
         "build:dev": "rimraf build.dev && cross-env BUILD=development npx webpack --config webpack/production.babel.js --output-path build/dev --progress --bail",
         "flow": "flow check src",
@@ -22,7 +22,7 @@
         "test:unit": "npx jest",
         "test-unit:watch": "npx jest -o --watch",
         "server:beta": "node ./server/index.js --buildType=beta",
-        "server:prod": "node ./server/index.js --buildType=prod"
+        "server:stable": "node ./server/index.js --buildType=stable"
     },
     "dependencies": {
         "babel": "^6.23.0",

scripts/docker-build.sh

@@ -2,7 +2,7 @@
 
 cd "$(dirname "$0")"
 
-if [[ "$1" == "dev" || "$1" == 'beta' || "$1" == 'prod' ]]
+if [[ "$1" == "dev" || "$1" == "beta" || "$1" == "stable" ]]
     then
         mkdir -p ../build
         rm -rf ../build/$1
@@ -12,6 +12,8 @@ if [[ "$1" == "dev" || "$1" == 'beta' || "$1" == 'prod' ]]
         docker cp trezor-wallet:/trezor-wallet-app/build/$1 ../build/$1
         docker stop trezor-wallet
         docker rm trezor-wallet
+        echo "DONE!"
+        echo "Build directory: "$1
     else
-        echo "invalid parameters... valid parameters are (beta, dev, prod)"
+        echo "invalid parameters... valid parameters are (dev, beta, stable)"
 fi

scripts/s3sync.sh

@@ -13,41 +13,63 @@ function confirm {
     fi
 }
 
-if [ "x$1" == "x" ]; then
-    echo "./s3sync.sh stage|beta|wallet [-d]"
+
+# Validate params
+if [ "x$1" == "x" ] || [ "x$2" == "x" ]; then
+    echo "Invalid params"
+    echo "./s3sync.sh beta|stable stage|beta|stable [clear]"
     exit 1
 fi
 
+# Validate destination param
+if [ "x$1" != "xstage" ] && [ "x$1" != "xbeta" ] && [ "x$1" != "xstable" ]; then
+    echo "Invalid destination: "$1
+    echo "use: stage|beta|stable"
+    exit 1
+fi
+
+# Validate source param
+if [ "x$2" != "xbeta" ] && [ "x$2" != "xstable" ]; then
+    echo "Invalid source: "$2
+    echo "use: beta|stable"
+    exit 1
+fi
+
+# Set source directory
+if [ "x$2" == "xbeta" ]; then
+    SOURCE=../build/beta
+
+elif [ "x$2" == "xstable" ]; then
+    SOURCE=../build/stable
+fi
+
+# Set destination
 if [ "x$1" == "xstage" ]; then
-    DIST=../build/beta
     BUCKET=stage.mytrezor.com
     DISTRIBUTION_ID="E24M0QWO692FQL"
-
 elif [ "x$1" == "xbeta" ]; then
-    DIST=../build/beta
     BUCKET=beta.mytrezor.com
     DISTRIBUTION_ID="E1PONNHWUNCQ9M"
-
-    confirm
-
-elif [ "x$1" == "xwallet" ]; then
-    DIST=../build/prod
+elif [ "x$2" == "xstable" ]; then
     BUCKET=wallet.mytrezor.com
     DISTRIBUTION_ID="EZM01GFTITGVD"
+fi
 
+echo "sync "$SOURCE" with "$BUCKET"/next"
+
+if [ "x$1" == "xbeta" ] || [ "x$1" == "xstable" ]; then
     confirm
-
 fi
 
-set -e
-cd `dirname $0`
+# set -e
+# cd `dirname $0`
 
-if [ "x$2" == "x-d" ]; then
-    aws s3 sync --delete --cache-control 'public, max-age=3600' $DIST s3://$BUCKET/next
-else
-    aws s3 sync --cache-control 'public, max-age=3600' $DIST s3://$BUCKET/next
-fi
+# if [ "x$3" == "x-d" ]; then
+#     aws s3 sync --delete --cache-control 'public, max-age=3600' $SOURCE s3://$BUCKET/next
+# else
+#     aws s3 sync --cache-control 'public, max-age=3600' $SOURCE s3://$BUCKET/next
+# fi
 
-aws cloudfront create-invalidation --distribution-id $DISTRIBUTION_ID --paths '/*'
+# aws cloudfront create-invalidation --distribution-id $DISTRIBUTION_ID --paths '/next/*'
 
 echo "DONE"