Merge pull request #3509 from ethereum/fixdeploy

fix deploys

.circleci/config.yml

@@ -247,7 +247,6 @@ jobs:
     environment:
       COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
       COMMIT_AUTHOR: "Circle CI"
-      FILES_TO_PACKAGE: "dist/apps/remix-ide/index.html dist/apps/remix-ide/404.html dist/apps/remix-ide/*.js dist/apps/remix-ide/assets dist/apps/remix-ide/favicon.ico"
     working_directory: ~/remix-project
 
     parameters:
@@ -259,9 +258,7 @@ jobs:
       - attach_workspace:
           at: .
       - run: unzip ./persist/predeploy.zip
-      - run:
-          name: Deploy
-          command: ./apps/remix-ide/ci/deploy_from_travis_remix-<< parameters.script >>.sh;
+      - run: ./apps/remix-ide/ci/deploy_from_travis_remix-<< parameters.script >>.sh
     
 workflows:
   run_flaky_tests:
@@ -329,6 +326,7 @@ workflows:
               only: ['master', 'remix_live', 'remix_beta']
       - deploy-build:
           script: "live"
+          name: "deploy-live"
           requires:
             - lint
             - remix-libs
@@ -340,6 +338,7 @@ workflows:
               only: remix_live
       - deploy-build:
           script: "alpha"
+          name: "deploy-alpha"
           requires:
             - lint
             - remix-libs
@@ -351,6 +350,7 @@ workflows:
               only: master
       - deploy-build:
           script: "beta"
+          name: "deploy-beta"
           requires:
             - lint
             - remix-libs

apps/remix-ide/ci/deploy_from_travis_remix-alpha.sh

@@ -1,24 +1,20 @@
 #!/bin/bash
 
 set -e
-
 SHA=`git rev-parse --short --verify HEAD`
 
+cd dist/apps/remix-ide
+
+git init
 git config user.name "$COMMIT_AUTHOR"
 git config user.email "$COMMIT_AUTHOR_EMAIL"
-git checkout --orphan gh-pages
-git rm --cached -r -f .
+
 echo "# Automatic build" > README.md
 echo "Built website from \`$SHA\`. See https://github.com/ethereum/remix-ide/ for details." >> README.md
 echo "To use an offline copy, download \`remix-$SHA.zip\`." >> README.md
-cp -r $FILES_TO_PACKAGE "./"
-rm -rf dist
-ls
-FILES_TO_DEPLOY="assets index.html 404.html *.js *.css favicon.ico"
-# ZIP the whole directory
-zip -r remix-$SHA.zip $FILES_TO_DEPLOY
-# -f is needed because "build" is part of .gitignore
-git add -f $FILES_TO_DEPLOY remix-$SHA.zip
+
+zip -r remix-$SHA.zip .
+git add .
 git commit -m "Built website from {$SHA}."
 
 git push -f git@github.com:ethereum/remix-live-alpha.git gh-pages

apps/remix-ide/ci/deploy_from_travis_remix-beta.sh

@@ -1,24 +1,20 @@
 #!/bin/bash
 
 set -e
-
 SHA=`git rev-parse --short --verify HEAD`
 
+cd dist/apps/remix-ide
+
+git init
 git config user.name "$COMMIT_AUTHOR"
 git config user.email "$COMMIT_AUTHOR_EMAIL"
-git checkout --orphan gh-pages
-git rm --cached -r -f .
+
 echo "# Automatic build" > README.md
 echo "Built website from \`$SHA\`. See https://github.com/ethereum/remix-ide/ for details." >> README.md
 echo "To use an offline copy, download \`remix-$SHA.zip\`." >> README.md
-cp -r $FILES_TO_PACKAGE "./"
-rm -rf dist
-ls
-FILES_TO_DEPLOY="assets index.html 404.html *.js *.css favicon.ico"
-# ZIP the whole directory
-zip -r remix-$SHA.zip $FILES_TO_DEPLOY
-# -f is needed because "build" is part of .gitignore
-git add -f $FILES_TO_DEPLOY remix-$SHA.zip
+
+zip -r remix-$SHA.zip .
+git add .
 git commit -m "Built website from {$SHA}."
 
 git push -f git@github.com:ethereum/remix-live-beta.git gh-pages

apps/remix-ide/ci/deploy_from_travis_remix-live.sh

@@ -1,24 +1,20 @@
 #!/bin/bash
 
 set -e
-
 SHA=`git rev-parse --short --verify HEAD`
 
+cd dist/apps/remix-ide
+
+git init
 git config user.name "$COMMIT_AUTHOR"
 git config user.email "$COMMIT_AUTHOR_EMAIL"
-git checkout --orphan gh-pages
-git rm --cached -r -f .
+
 echo "# Automatic build" > README.md
 echo "Built website from \`$SHA\`. See https://github.com/ethereum/remix-ide/ for details." >> README.md
 echo "To use an offline copy, download \`remix-$SHA.zip\`." >> README.md
-cp -r $FILES_TO_PACKAGE "./"
-rm -rf dist
-ls
-FILES_TO_DEPLOY="assets index.html 404.html *.js *.css favicon.ico"
-# ZIP the whole directory
-zip -r remix-$SHA.zip $FILES_TO_DEPLOY
-# -f is needed because "build" is part of .gitignore
-git add -f $FILES_TO_DEPLOY remix-$SHA.zip
+
+zip -r remix-$SHA.zip .
+git add .
 git commit -m "Built website from {$SHA}."
 
 git push -f git@github.com:ethereum/remix-live.git gh-pages