From 3f7e1ec4b2cd592229fc73b563fdd7687050c03e Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Thu, 9 Mar 2023 10:31:58 +0100
Subject: [PATCH 01/36] name the deploys

---
 .circleci/config.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8db1c5554e..06292fa09f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -329,6 +329,7 @@ workflows:
               only: ['master', 'remix_live', 'remix_beta']
       - deploy-build:
           script: "live"
+          name: "live"
           requires:
             - lint
             - remix-libs
@@ -340,6 +341,7 @@ workflows:
               only: remix_live
       - deploy-build:
           script: "alpha"
+          name: "alpha"
           requires:
             - lint
             - remix-libs
@@ -351,6 +353,7 @@ workflows:
               only: master
       - deploy-build:
           script: "beta"
+          name: "beta"
           requires:
             - lint
             - remix-libs

From 2d1f54848ed05d9c33a604d81ab2c6e15e964457 Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Thu, 9 Mar 2023 12:16:25 +0100
Subject: [PATCH 02/36] config

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 06292fa09f..74baf7db98 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -326,7 +326,7 @@ workflows:
       - predeploy:
           filters:
             branches:
-              only: ['master', 'remix_live', 'remix_beta']
+              only: ['master', 'remix_live', 'remix_beta', 'fixdeploy']
       - deploy-build:
           script: "live"
           name: "live"

From 6769462ac34270eda8a5f2a2c3915473675d912a Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Thu, 9 Mar 2023 12:23:24 +0100
Subject: [PATCH 03/36] revision

---
 .circleci/config.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 74baf7db98..ea4fcba9fc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -223,6 +223,8 @@ jobs:
     working_directory: ~/remix-project
     steps:
       - checkout
+      - run: echo << pipeline.git.revision >>
+      - run: git rev-parse --short --verify HEAD
       - restore_cache:
           keys:
             - v1-deps-{{ checksum "yarn.lock" }}

From cd9ff8cd3eb07ae5bcb55d7227dfc01e4679d534 Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Thu, 9 Mar 2023 12:30:10 +0100
Subject: [PATCH 04/36] cut

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ea4fcba9fc..09f4e7ae2d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -223,7 +223,7 @@ jobs:
     working_directory: ~/remix-project
     steps:
       - checkout
-      - run: echo << pipeline.git.revision >>
+      - run: echo << pipeline.git.revision >> | cut -b 1-9
       - run: git rev-parse --short --verify HEAD
       - restore_cache:
           keys:

From a8d4daeca33cbd0aa272a15e465a3c49a8fd3bac Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Thu, 9 Mar 2023 13:06:05 +0100
Subject: [PATCH 05/36] refactor

---
 .circleci/config.yml | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 09f4e7ae2d..adb8ff8ac2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -249,7 +249,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:
@@ -261,9 +260,18 @@ 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: |
+          - SHA=`git rev-parse --short --verify HEAD`
+          - cd dist/apps/remix-ide
+          - git init
+          - git checkout -b gh-pages
+          - git config user.name "$COMMIT_AUTHOR"
+          - git config user.email "$COMMIT_AUTHOR_EMAIL"
+          - zip -r remix-$SHA.zip .
+          - git add -f .
+          - git commit -m "Built website from {$SHA}."
+          - git status
+          - ls -la
     
 workflows:
   run_flaky_tests:
@@ -365,5 +373,13 @@ workflows:
           filters:
             branches:
               only: remix_beta
+      - deploy-build:
+          script: "test"
+          name: "test"
+          requires:
+            - predeploy
+          filters:
+            branches:
+              only: fixdeploy
 
 # VS Code Extension Version: 1.5.1

From 37b89539c30f7f30b30b18ebd6dd84b022611a6f Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Thu, 9 Mar 2023 13:11:59 +0100
Subject: [PATCH 06/36] run

---
 .circleci/config.yml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index adb8ff8ac2..9a5c799947 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -260,18 +260,18 @@ jobs:
       - attach_workspace:
           at: .
       - run: unzip ./persist/predeploy.zip
-      - run: |
-          - SHA=`git rev-parse --short --verify HEAD`
-          - cd dist/apps/remix-ide
-          - git init
-          - git checkout -b gh-pages
-          - git config user.name "$COMMIT_AUTHOR"
-          - git config user.email "$COMMIT_AUTHOR_EMAIL"
-          - zip -r remix-$SHA.zip .
-          - git add -f .
-          - git commit -m "Built website from {$SHA}."
-          - git status
-          - ls -la
+
+      - run: SHA=`git rev-parse --short --verify HEAD`
+      - run: cd dist/apps/remix-ide
+      - run: git init
+      - run: git checkout -b gh-pages
+      - run: git config user.name "$COMMIT_AUTHOR"
+      - run: git config user.email "$COMMIT_AUTHOR_EMAIL"
+      - run: zip -r remix-$SHA.zip .
+      - run: git add -f .
+      - run: git commit -m "Built website from {$SHA}."
+      - run: git status
+      - run: ls -la
     
 workflows:
   run_flaky_tests:

From 30874f76333565664763e36fefb4fdbed8beb277 Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Thu, 9 Mar 2023 13:12:41 +0100
Subject: [PATCH 07/36] dev

---
 .../ci/deploy_from_travis_remix-test.sh         | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100755 apps/remix-ide/ci/deploy_from_travis_remix-test.sh

diff --git a/apps/remix-ide/ci/deploy_from_travis_remix-test.sh b/apps/remix-ide/ci/deploy_from_travis_remix-test.sh
new file mode 100755
index 0000000000..a520a5f5a0
--- /dev/null
+++ b/apps/remix-ide/ci/deploy_from_travis_remix-test.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -e
+
+cd dist
+
+git init
+git config user.name "$COMMIT_AUTHOR"
+git config user.email "$COMMIT_AUTHOR_EMAIL"
+
+zip -r remix-$1.zip .
+git add .
+git commit -m "Built website from {$1}."
+
+ls -la
+git status
+

From 722abd5094cd76780657c5a0c3664ff797e2d353 Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Thu, 9 Mar 2023 13:14:23 +0100
Subject: [PATCH 08/36] dev

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9a5c799947..928ad7a2e2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -233,7 +233,7 @@ jobs:
           key: v1-deps-{{ checksum "yarn.lock" }}
           paths:
             - node_modules
-      - run: yarn build:production
+      - run: yarn build
       - run: mkdir persist && zip -0 -r persist/predeploy.zip dist
       - persist_to_workspace:
           root: .

From 91b90b095600a873c58cbf5a3f7b57a7e34c8cac Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Thu, 9 Mar 2023 13:20:11 +0100
Subject: [PATCH 09/36] rm

---
 .circleci/config.yml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 928ad7a2e2..3beb05015e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -260,18 +260,6 @@ jobs:
       - attach_workspace:
           at: .
       - run: unzip ./persist/predeploy.zip
-
-      - run: SHA=`git rev-parse --short --verify HEAD`
-      - run: cd dist/apps/remix-ide
-      - run: git init
-      - run: git checkout -b gh-pages
-      - run: git config user.name "$COMMIT_AUTHOR"
-      - run: git config user.email "$COMMIT_AUTHOR_EMAIL"
-      - run: zip -r remix-$SHA.zip .
-      - run: git add -f .
-      - run: git commit -m "Built website from {$SHA}."
-      - run: git status
-      - run: ls -la
     
 workflows:
   run_flaky_tests:

From a75ed607221ff4dcd604a50d2e80bf13673adffe Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Thu, 9 Mar 2023 13:23:07 +0100
Subject: [PATCH 10/36] test deploy

---
 .circleci/config.yml                               |  1 +
 apps/remix-ide/ci/deploy_from_travis_remix-test.sh | 11 ++++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3beb05015e..4f4472b15c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -260,6 +260,7 @@ jobs:
       - attach_workspace:
           at: .
       - run: unzip ./persist/predeploy.zip
+      - run: ./apps/remix-ide/ci/deploy_from_travis_remix-test.sh
     
 workflows:
   run_flaky_tests:
diff --git a/apps/remix-ide/ci/deploy_from_travis_remix-test.sh b/apps/remix-ide/ci/deploy_from_travis_remix-test.sh
index a520a5f5a0..3172e6091b 100755
--- a/apps/remix-ide/ci/deploy_from_travis_remix-test.sh
+++ b/apps/remix-ide/ci/deploy_from_travis_remix-test.sh
@@ -1,16 +1,21 @@
 #!/bin/bash
 
 set -e
+SHA=`git rev-parse --short --verify HEAD`
 
-cd dist
+cd dist/apps/remix-ide
 
 git init
 git config user.name "$COMMIT_AUTHOR"
 git config user.email "$COMMIT_AUTHOR_EMAIL"
 
-zip -r remix-$1.zip .
+zip -r remix-$SHA.zip .
+
 git add .
-git commit -m "Built website from {$1}."
+
+git status
+
+git commit -m "Built website from {$SHA}."
 
 ls -la
 git status

From 07f1137cb59108e0843df068c6b876777511ceca Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Thu, 9 Mar 2023 13:34:24 +0100
Subject: [PATCH 11/36] push

---
 apps/remix-ide/ci/deploy_from_travis_remix-test.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/remix-ide/ci/deploy_from_travis_remix-test.sh b/apps/remix-ide/ci/deploy_from_travis_remix-test.sh
index 3172e6091b..81068d3117 100755
--- a/apps/remix-ide/ci/deploy_from_travis_remix-test.sh
+++ b/apps/remix-ide/ci/deploy_from_travis_remix-test.sh
@@ -20,3 +20,4 @@ git commit -m "Built website from {$SHA}."
 ls -la
 git status
 
+git push -f git@github.com:bunsenstraat/remix-test.git master:gh-pages
\ No newline at end of file

From 842b769d7492e856e91aae89e029f38fd01189b1 Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Thu, 9 Mar 2023 14:49:20 +0100
Subject: [PATCH 12/36] production

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4f4472b15c..e2c4df6b65 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -233,7 +233,7 @@ jobs:
           key: v1-deps-{{ checksum "yarn.lock" }}
           paths:
             - node_modules
-      - run: yarn build
+      - run: yarn build:production
       - run: mkdir persist && zip -0 -r persist/predeploy.zip dist
       - persist_to_workspace:
           root: .

From 769518420b4ad3b94d2de3f37a093d8d0186a95d Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Thu, 9 Mar 2023 14:59:26 +0100
Subject: [PATCH 13/36] changes names

---
 .circleci/config.yml                          | 10 +++++-----
 .../ci/deploy_from_travis_remix-alpha.sh      | 19 +++++--------------
 .../ci/deploy_from_travis_remix-beta.sh       | 19 +++++--------------
 .../ci/deploy_from_travis_remix-live.sh       | 19 +++++--------------
 .../ci/deploy_from_travis_remix-test.sh       |  8 --------
 5 files changed, 20 insertions(+), 55 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e2c4df6b65..ccc48b7aaa 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -260,7 +260,7 @@ jobs:
       - attach_workspace:
           at: .
       - run: unzip ./persist/predeploy.zip
-      - run: ./apps/remix-ide/ci/deploy_from_travis_remix-test.sh
+      - run: ./apps/remix-ide/ci/deploy_from_travis_remix-<< parameters.script >>.sh
     
 workflows:
   run_flaky_tests:
@@ -328,7 +328,7 @@ workflows:
               only: ['master', 'remix_live', 'remix_beta', 'fixdeploy']
       - deploy-build:
           script: "live"
-          name: "live"
+          name: "deploy-live"
           requires:
             - lint
             - remix-libs
@@ -340,7 +340,7 @@ workflows:
               only: remix_live
       - deploy-build:
           script: "alpha"
-          name: "alpha"
+          name: "deploy-alpha"
           requires:
             - lint
             - remix-libs
@@ -352,7 +352,7 @@ workflows:
               only: master
       - deploy-build:
           script: "beta"
-          name: "beta"
+          name: "deploy-beta"
           requires:
             - lint
             - remix-libs
@@ -364,7 +364,7 @@ workflows:
               only: remix_beta
       - deploy-build:
           script: "test"
-          name: "test"
+          name: "deploy-test"
           requires:
             - predeploy
           filters:
diff --git a/apps/remix-ide/ci/deploy_from_travis_remix-alpha.sh b/apps/remix-ide/ci/deploy_from_travis_remix-alpha.sh
index 40d00bd8a8..c415e8d8d4 100755
--- a/apps/remix-ide/ci/deploy_from_travis_remix-alpha.sh
+++ b/apps/remix-ide/ci/deploy_from_travis_remix-alpha.sh
@@ -1,24 +1,15 @@
 #!/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
diff --git a/apps/remix-ide/ci/deploy_from_travis_remix-beta.sh b/apps/remix-ide/ci/deploy_from_travis_remix-beta.sh
index f53353b3dc..66bc6eb3b4 100755
--- a/apps/remix-ide/ci/deploy_from_travis_remix-beta.sh
+++ b/apps/remix-ide/ci/deploy_from_travis_remix-beta.sh
@@ -1,24 +1,15 @@
 #!/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
diff --git a/apps/remix-ide/ci/deploy_from_travis_remix-live.sh b/apps/remix-ide/ci/deploy_from_travis_remix-live.sh
index afe6bcc816..f8e333d344 100755
--- a/apps/remix-ide/ci/deploy_from_travis_remix-live.sh
+++ b/apps/remix-ide/ci/deploy_from_travis_remix-live.sh
@@ -1,24 +1,15 @@
 #!/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
diff --git a/apps/remix-ide/ci/deploy_from_travis_remix-test.sh b/apps/remix-ide/ci/deploy_from_travis_remix-test.sh
index 81068d3117..59afcccf03 100755
--- a/apps/remix-ide/ci/deploy_from_travis_remix-test.sh
+++ b/apps/remix-ide/ci/deploy_from_travis_remix-test.sh
@@ -8,16 +8,8 @@ cd dist/apps/remix-ide
 git init
 git config user.name "$COMMIT_AUTHOR"
 git config user.email "$COMMIT_AUTHOR_EMAIL"
-
 zip -r remix-$SHA.zip .
-
 git add .
-
-git status
-
 git commit -m "Built website from {$SHA}."
 
-ls -la
-git status
-
 git push -f git@github.com:bunsenstraat/remix-test.git master:gh-pages
\ No newline at end of file

From 41dc80ad04514f6c26fad45b4f54d673eba63721 Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Thu, 9 Mar 2023 15:04:33 +0100
Subject: [PATCH 14/36] tests passed

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ccc48b7aaa..046f20349d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -366,7 +366,7 @@ workflows:
           script: "test"
           name: "deploy-test"
           requires:
-            - predeploy
+            - tests-passed
           filters:
             branches:
               only: fixdeploy

From 15fa9df8440016cdfb430e72b5de5843fe618d26 Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Thu, 9 Mar 2023 15:12:13 +0100
Subject: [PATCH 15/36] requires

---
 .circleci/config.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 046f20349d..2be0924b80 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -223,8 +223,6 @@ jobs:
     working_directory: ~/remix-project
     steps:
       - checkout
-      - run: echo << pipeline.git.revision >> | cut -b 1-9
-      - run: git rev-parse --short --verify HEAD
       - restore_cache:
           keys:
             - v1-deps-{{ checksum "yarn.lock" }}
@@ -366,7 +364,11 @@ workflows:
           script: "test"
           name: "deploy-test"
           requires:
-            - tests-passed
+            - lint
+            - remix-libs
+            - remix-ide-browser
+            - plugins
+            - predeploy
           filters:
             branches:
               only: fixdeploy

From 535d60778e2a7d763c3a97a7acd78d3823643d86 Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Thu, 9 Mar 2023 15:24:23 +0100
Subject: [PATCH 16/36] rm test

---
 .circleci/config.yml                              | 12 ------------
 .../remix-ide/ci/deploy_from_travis_remix-test.sh | 15 ---------------
 2 files changed, 27 deletions(-)
 delete mode 100755 apps/remix-ide/ci/deploy_from_travis_remix-test.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2be0924b80..d3818d4d9c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -360,17 +360,5 @@ workflows:
           filters:
             branches:
               only: remix_beta
-      - deploy-build:
-          script: "test"
-          name: "deploy-test"
-          requires:
-            - lint
-            - remix-libs
-            - remix-ide-browser
-            - plugins
-            - predeploy
-          filters:
-            branches:
-              only: fixdeploy
 
 # VS Code Extension Version: 1.5.1
diff --git a/apps/remix-ide/ci/deploy_from_travis_remix-test.sh b/apps/remix-ide/ci/deploy_from_travis_remix-test.sh
deleted file mode 100755
index 59afcccf03..0000000000
--- a/apps/remix-ide/ci/deploy_from_travis_remix-test.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/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"
-zip -r remix-$SHA.zip .
-git add .
-git commit -m "Built website from {$SHA}."
-
-git push -f git@github.com:bunsenstraat/remix-test.git master:gh-pages
\ No newline at end of file

From f52fa6e79d03bbd3a84283e403de1a43ecfdd170 Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Thu, 9 Mar 2023 15:29:37 +0100
Subject: [PATCH 17/36] readme

---
 apps/remix-ide/ci/deploy_from_travis_remix-alpha.sh | 5 +++++
 apps/remix-ide/ci/deploy_from_travis_remix-beta.sh  | 5 +++++
 apps/remix-ide/ci/deploy_from_travis_remix-live.sh  | 5 +++++
 3 files changed, 15 insertions(+)

diff --git a/apps/remix-ide/ci/deploy_from_travis_remix-alpha.sh b/apps/remix-ide/ci/deploy_from_travis_remix-alpha.sh
index c415e8d8d4..93aacf0b03 100755
--- a/apps/remix-ide/ci/deploy_from_travis_remix-alpha.sh
+++ b/apps/remix-ide/ci/deploy_from_travis_remix-alpha.sh
@@ -8,6 +8,11 @@ cd dist/apps/remix-ide
 git init
 git config user.name "$COMMIT_AUTHOR"
 git config user.email "$COMMIT_AUTHOR_EMAIL"
+
+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
+
 zip -r remix-$SHA.zip .
 git add .
 git commit -m "Built website from {$SHA}."
diff --git a/apps/remix-ide/ci/deploy_from_travis_remix-beta.sh b/apps/remix-ide/ci/deploy_from_travis_remix-beta.sh
index 66bc6eb3b4..2db4dfafc7 100755
--- a/apps/remix-ide/ci/deploy_from_travis_remix-beta.sh
+++ b/apps/remix-ide/ci/deploy_from_travis_remix-beta.sh
@@ -8,6 +8,11 @@ cd dist/apps/remix-ide
 git init
 git config user.name "$COMMIT_AUTHOR"
 git config user.email "$COMMIT_AUTHOR_EMAIL"
+
+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
+
 zip -r remix-$SHA.zip .
 git add .
 git commit -m "Built website from {$SHA}."
diff --git a/apps/remix-ide/ci/deploy_from_travis_remix-live.sh b/apps/remix-ide/ci/deploy_from_travis_remix-live.sh
index f8e333d344..16f2e425c9 100755
--- a/apps/remix-ide/ci/deploy_from_travis_remix-live.sh
+++ b/apps/remix-ide/ci/deploy_from_travis_remix-live.sh
@@ -8,6 +8,11 @@ cd dist/apps/remix-ide
 git init
 git config user.name "$COMMIT_AUTHOR"
 git config user.email "$COMMIT_AUTHOR_EMAIL"
+
+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
+
 zip -r remix-$SHA.zip .
 git add .
 git commit -m "Built website from {$SHA}."

From 1e53b9385fa40c9ccf014730ecbaed509b71314b Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Thu, 9 Mar 2023 15:30:23 +0100
Subject: [PATCH 18/36] rm test

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d3818d4d9c..9c3a936536 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -323,7 +323,7 @@ workflows:
       - predeploy:
           filters:
             branches:
-              only: ['master', 'remix_live', 'remix_beta', 'fixdeploy']
+              only: ['master', 'remix_live', 'remix_beta']
       - deploy-build:
           script: "live"
           name: "deploy-live"

From ed8364b74739486e458d3b11d076f7ce8b5942ec Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Thu, 9 Mar 2023 10:31:58 +0100
Subject: [PATCH 19/36] name the deploys

---
 .circleci/config.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8db1c5554e..06292fa09f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -329,6 +329,7 @@ workflows:
               only: ['master', 'remix_live', 'remix_beta']
       - deploy-build:
           script: "live"
+          name: "live"
           requires:
             - lint
             - remix-libs
@@ -340,6 +341,7 @@ workflows:
               only: remix_live
       - deploy-build:
           script: "alpha"
+          name: "alpha"
           requires:
             - lint
             - remix-libs
@@ -351,6 +353,7 @@ workflows:
               only: master
       - deploy-build:
           script: "beta"
+          name: "beta"
           requires:
             - lint
             - remix-libs

From 4c714b0f8b11f1170c00e64ed9c693526e3a4eff Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Thu, 9 Mar 2023 12:16:25 +0100
Subject: [PATCH 20/36] config

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 06292fa09f..74baf7db98 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -326,7 +326,7 @@ workflows:
       - predeploy:
           filters:
             branches:
-              only: ['master', 'remix_live', 'remix_beta']
+              only: ['master', 'remix_live', 'remix_beta', 'fixdeploy']
       - deploy-build:
           script: "live"
           name: "live"

From 660fad6d6a5bd9b9861193f7d6362c9a37382d8f Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Thu, 9 Mar 2023 12:23:24 +0100
Subject: [PATCH 21/36] revision

---
 .circleci/config.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 74baf7db98..ea4fcba9fc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -223,6 +223,8 @@ jobs:
     working_directory: ~/remix-project
     steps:
       - checkout
+      - run: echo << pipeline.git.revision >>
+      - run: git rev-parse --short --verify HEAD
       - restore_cache:
           keys:
             - v1-deps-{{ checksum "yarn.lock" }}

From 1fa639dde212f4704e400951a9c47da6037f3692 Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Thu, 9 Mar 2023 12:30:10 +0100
Subject: [PATCH 22/36] cut

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ea4fcba9fc..09f4e7ae2d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -223,7 +223,7 @@ jobs:
     working_directory: ~/remix-project
     steps:
       - checkout
-      - run: echo << pipeline.git.revision >>
+      - run: echo << pipeline.git.revision >> | cut -b 1-9
       - run: git rev-parse --short --verify HEAD
       - restore_cache:
           keys:

From 2996abfbe463d8cef33b59f339f0fe4535e8f9ac Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Thu, 9 Mar 2023 13:06:05 +0100
Subject: [PATCH 23/36] refactor

---
 .circleci/config.yml | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 09f4e7ae2d..adb8ff8ac2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -249,7 +249,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:
@@ -261,9 +260,18 @@ 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: |
+          - SHA=`git rev-parse --short --verify HEAD`
+          - cd dist/apps/remix-ide
+          - git init
+          - git checkout -b gh-pages
+          - git config user.name "$COMMIT_AUTHOR"
+          - git config user.email "$COMMIT_AUTHOR_EMAIL"
+          - zip -r remix-$SHA.zip .
+          - git add -f .
+          - git commit -m "Built website from {$SHA}."
+          - git status
+          - ls -la
     
 workflows:
   run_flaky_tests:
@@ -365,5 +373,13 @@ workflows:
           filters:
             branches:
               only: remix_beta
+      - deploy-build:
+          script: "test"
+          name: "test"
+          requires:
+            - predeploy
+          filters:
+            branches:
+              only: fixdeploy
 
 # VS Code Extension Version: 1.5.1

From 15c29400564342b0fe80b95e89b5782be3f2a66b Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Thu, 9 Mar 2023 13:11:59 +0100
Subject: [PATCH 24/36] run

---
 .circleci/config.yml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index adb8ff8ac2..9a5c799947 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -260,18 +260,18 @@ jobs:
       - attach_workspace:
           at: .
       - run: unzip ./persist/predeploy.zip
-      - run: |
-          - SHA=`git rev-parse --short --verify HEAD`
-          - cd dist/apps/remix-ide
-          - git init
-          - git checkout -b gh-pages
-          - git config user.name "$COMMIT_AUTHOR"
-          - git config user.email "$COMMIT_AUTHOR_EMAIL"
-          - zip -r remix-$SHA.zip .
-          - git add -f .
-          - git commit -m "Built website from {$SHA}."
-          - git status
-          - ls -la
+
+      - run: SHA=`git rev-parse --short --verify HEAD`
+      - run: cd dist/apps/remix-ide
+      - run: git init
+      - run: git checkout -b gh-pages
+      - run: git config user.name "$COMMIT_AUTHOR"
+      - run: git config user.email "$COMMIT_AUTHOR_EMAIL"
+      - run: zip -r remix-$SHA.zip .
+      - run: git add -f .
+      - run: git commit -m "Built website from {$SHA}."
+      - run: git status
+      - run: ls -la
     
 workflows:
   run_flaky_tests:

From 6f42c7f25b0f39c88922b123633a14f755d43321 Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Thu, 9 Mar 2023 13:12:41 +0100
Subject: [PATCH 25/36] dev

---
 .../ci/deploy_from_travis_remix-test.sh         | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100755 apps/remix-ide/ci/deploy_from_travis_remix-test.sh

diff --git a/apps/remix-ide/ci/deploy_from_travis_remix-test.sh b/apps/remix-ide/ci/deploy_from_travis_remix-test.sh
new file mode 100755
index 0000000000..a520a5f5a0
--- /dev/null
+++ b/apps/remix-ide/ci/deploy_from_travis_remix-test.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -e
+
+cd dist
+
+git init
+git config user.name "$COMMIT_AUTHOR"
+git config user.email "$COMMIT_AUTHOR_EMAIL"
+
+zip -r remix-$1.zip .
+git add .
+git commit -m "Built website from {$1}."
+
+ls -la
+git status
+

From 3ce7a0c7387d36e54cb691987ed9bc87e3d93878 Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Thu, 9 Mar 2023 13:14:23 +0100
Subject: [PATCH 26/36] dev

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9a5c799947..928ad7a2e2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -233,7 +233,7 @@ jobs:
           key: v1-deps-{{ checksum "yarn.lock" }}
           paths:
             - node_modules
-      - run: yarn build:production
+      - run: yarn build
       - run: mkdir persist && zip -0 -r persist/predeploy.zip dist
       - persist_to_workspace:
           root: .

From 5f34b77e41994f57a9e6c193bfc040de4b2c174a Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Thu, 9 Mar 2023 13:20:11 +0100
Subject: [PATCH 27/36] rm

---
 .circleci/config.yml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 928ad7a2e2..3beb05015e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -260,18 +260,6 @@ jobs:
       - attach_workspace:
           at: .
       - run: unzip ./persist/predeploy.zip
-
-      - run: SHA=`git rev-parse --short --verify HEAD`
-      - run: cd dist/apps/remix-ide
-      - run: git init
-      - run: git checkout -b gh-pages
-      - run: git config user.name "$COMMIT_AUTHOR"
-      - run: git config user.email "$COMMIT_AUTHOR_EMAIL"
-      - run: zip -r remix-$SHA.zip .
-      - run: git add -f .
-      - run: git commit -m "Built website from {$SHA}."
-      - run: git status
-      - run: ls -la
     
 workflows:
   run_flaky_tests:

From 969cdb753a66582752047ede8877dc23ce5196f5 Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Thu, 9 Mar 2023 13:23:07 +0100
Subject: [PATCH 28/36] test deploy

---
 .circleci/config.yml                               |  1 +
 apps/remix-ide/ci/deploy_from_travis_remix-test.sh | 11 ++++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3beb05015e..4f4472b15c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -260,6 +260,7 @@ jobs:
       - attach_workspace:
           at: .
       - run: unzip ./persist/predeploy.zip
+      - run: ./apps/remix-ide/ci/deploy_from_travis_remix-test.sh
     
 workflows:
   run_flaky_tests:
diff --git a/apps/remix-ide/ci/deploy_from_travis_remix-test.sh b/apps/remix-ide/ci/deploy_from_travis_remix-test.sh
index a520a5f5a0..3172e6091b 100755
--- a/apps/remix-ide/ci/deploy_from_travis_remix-test.sh
+++ b/apps/remix-ide/ci/deploy_from_travis_remix-test.sh
@@ -1,16 +1,21 @@
 #!/bin/bash
 
 set -e
+SHA=`git rev-parse --short --verify HEAD`
 
-cd dist
+cd dist/apps/remix-ide
 
 git init
 git config user.name "$COMMIT_AUTHOR"
 git config user.email "$COMMIT_AUTHOR_EMAIL"
 
-zip -r remix-$1.zip .
+zip -r remix-$SHA.zip .
+
 git add .
-git commit -m "Built website from {$1}."
+
+git status
+
+git commit -m "Built website from {$SHA}."
 
 ls -la
 git status

From 0c7f6871b5bb75a1759f55ded7f3c637debd021c Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Thu, 9 Mar 2023 13:34:24 +0100
Subject: [PATCH 29/36] push

---
 apps/remix-ide/ci/deploy_from_travis_remix-test.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/remix-ide/ci/deploy_from_travis_remix-test.sh b/apps/remix-ide/ci/deploy_from_travis_remix-test.sh
index 3172e6091b..81068d3117 100755
--- a/apps/remix-ide/ci/deploy_from_travis_remix-test.sh
+++ b/apps/remix-ide/ci/deploy_from_travis_remix-test.sh
@@ -20,3 +20,4 @@ git commit -m "Built website from {$SHA}."
 ls -la
 git status
 
+git push -f git@github.com:bunsenstraat/remix-test.git master:gh-pages
\ No newline at end of file

From 6a6200f9d858a4ced9c61584b9208254ccfc121d Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Thu, 9 Mar 2023 14:49:20 +0100
Subject: [PATCH 30/36] production

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4f4472b15c..e2c4df6b65 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -233,7 +233,7 @@ jobs:
           key: v1-deps-{{ checksum "yarn.lock" }}
           paths:
             - node_modules
-      - run: yarn build
+      - run: yarn build:production
       - run: mkdir persist && zip -0 -r persist/predeploy.zip dist
       - persist_to_workspace:
           root: .

From 272a458b6769ecafa823b1892a13ca9359576ac0 Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Thu, 9 Mar 2023 14:59:26 +0100
Subject: [PATCH 31/36] changes names

---
 .circleci/config.yml                          | 10 +++++-----
 .../ci/deploy_from_travis_remix-alpha.sh      | 19 +++++--------------
 .../ci/deploy_from_travis_remix-beta.sh       | 19 +++++--------------
 .../ci/deploy_from_travis_remix-live.sh       | 19 +++++--------------
 .../ci/deploy_from_travis_remix-test.sh       |  8 --------
 5 files changed, 20 insertions(+), 55 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e2c4df6b65..ccc48b7aaa 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -260,7 +260,7 @@ jobs:
       - attach_workspace:
           at: .
       - run: unzip ./persist/predeploy.zip
-      - run: ./apps/remix-ide/ci/deploy_from_travis_remix-test.sh
+      - run: ./apps/remix-ide/ci/deploy_from_travis_remix-<< parameters.script >>.sh
     
 workflows:
   run_flaky_tests:
@@ -328,7 +328,7 @@ workflows:
               only: ['master', 'remix_live', 'remix_beta', 'fixdeploy']
       - deploy-build:
           script: "live"
-          name: "live"
+          name: "deploy-live"
           requires:
             - lint
             - remix-libs
@@ -340,7 +340,7 @@ workflows:
               only: remix_live
       - deploy-build:
           script: "alpha"
-          name: "alpha"
+          name: "deploy-alpha"
           requires:
             - lint
             - remix-libs
@@ -352,7 +352,7 @@ workflows:
               only: master
       - deploy-build:
           script: "beta"
-          name: "beta"
+          name: "deploy-beta"
           requires:
             - lint
             - remix-libs
@@ -364,7 +364,7 @@ workflows:
               only: remix_beta
       - deploy-build:
           script: "test"
-          name: "test"
+          name: "deploy-test"
           requires:
             - predeploy
           filters:
diff --git a/apps/remix-ide/ci/deploy_from_travis_remix-alpha.sh b/apps/remix-ide/ci/deploy_from_travis_remix-alpha.sh
index 40d00bd8a8..c415e8d8d4 100755
--- a/apps/remix-ide/ci/deploy_from_travis_remix-alpha.sh
+++ b/apps/remix-ide/ci/deploy_from_travis_remix-alpha.sh
@@ -1,24 +1,15 @@
 #!/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
diff --git a/apps/remix-ide/ci/deploy_from_travis_remix-beta.sh b/apps/remix-ide/ci/deploy_from_travis_remix-beta.sh
index f53353b3dc..66bc6eb3b4 100755
--- a/apps/remix-ide/ci/deploy_from_travis_remix-beta.sh
+++ b/apps/remix-ide/ci/deploy_from_travis_remix-beta.sh
@@ -1,24 +1,15 @@
 #!/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
diff --git a/apps/remix-ide/ci/deploy_from_travis_remix-live.sh b/apps/remix-ide/ci/deploy_from_travis_remix-live.sh
index afe6bcc816..f8e333d344 100755
--- a/apps/remix-ide/ci/deploy_from_travis_remix-live.sh
+++ b/apps/remix-ide/ci/deploy_from_travis_remix-live.sh
@@ -1,24 +1,15 @@
 #!/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
diff --git a/apps/remix-ide/ci/deploy_from_travis_remix-test.sh b/apps/remix-ide/ci/deploy_from_travis_remix-test.sh
index 81068d3117..59afcccf03 100755
--- a/apps/remix-ide/ci/deploy_from_travis_remix-test.sh
+++ b/apps/remix-ide/ci/deploy_from_travis_remix-test.sh
@@ -8,16 +8,8 @@ cd dist/apps/remix-ide
 git init
 git config user.name "$COMMIT_AUTHOR"
 git config user.email "$COMMIT_AUTHOR_EMAIL"
-
 zip -r remix-$SHA.zip .
-
 git add .
-
-git status
-
 git commit -m "Built website from {$SHA}."
 
-ls -la
-git status
-
 git push -f git@github.com:bunsenstraat/remix-test.git master:gh-pages
\ No newline at end of file

From bb1126d13ec1cc11152504c005a6f23c07e1de79 Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Thu, 9 Mar 2023 15:04:33 +0100
Subject: [PATCH 32/36] tests passed

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ccc48b7aaa..046f20349d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -366,7 +366,7 @@ workflows:
           script: "test"
           name: "deploy-test"
           requires:
-            - predeploy
+            - tests-passed
           filters:
             branches:
               only: fixdeploy

From ea4220cd1c454d4ce9f92869eee15273ad10d710 Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Thu, 9 Mar 2023 15:12:13 +0100
Subject: [PATCH 33/36] requires

---
 .circleci/config.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 046f20349d..2be0924b80 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -223,8 +223,6 @@ jobs:
     working_directory: ~/remix-project
     steps:
       - checkout
-      - run: echo << pipeline.git.revision >> | cut -b 1-9
-      - run: git rev-parse --short --verify HEAD
       - restore_cache:
           keys:
             - v1-deps-{{ checksum "yarn.lock" }}
@@ -366,7 +364,11 @@ workflows:
           script: "test"
           name: "deploy-test"
           requires:
-            - tests-passed
+            - lint
+            - remix-libs
+            - remix-ide-browser
+            - plugins
+            - predeploy
           filters:
             branches:
               only: fixdeploy

From dceef1fd7c8719240920510676a7e58f06f23af9 Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Thu, 9 Mar 2023 15:24:23 +0100
Subject: [PATCH 34/36] rm test

---
 .circleci/config.yml                              | 12 ------------
 .../remix-ide/ci/deploy_from_travis_remix-test.sh | 15 ---------------
 2 files changed, 27 deletions(-)
 delete mode 100755 apps/remix-ide/ci/deploy_from_travis_remix-test.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2be0924b80..d3818d4d9c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -360,17 +360,5 @@ workflows:
           filters:
             branches:
               only: remix_beta
-      - deploy-build:
-          script: "test"
-          name: "deploy-test"
-          requires:
-            - lint
-            - remix-libs
-            - remix-ide-browser
-            - plugins
-            - predeploy
-          filters:
-            branches:
-              only: fixdeploy
 
 # VS Code Extension Version: 1.5.1
diff --git a/apps/remix-ide/ci/deploy_from_travis_remix-test.sh b/apps/remix-ide/ci/deploy_from_travis_remix-test.sh
deleted file mode 100755
index 59afcccf03..0000000000
--- a/apps/remix-ide/ci/deploy_from_travis_remix-test.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/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"
-zip -r remix-$SHA.zip .
-git add .
-git commit -m "Built website from {$SHA}."
-
-git push -f git@github.com:bunsenstraat/remix-test.git master:gh-pages
\ No newline at end of file

From 0e056e2d05741145f996431a5f18b6181cf5f8ac Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Thu, 9 Mar 2023 15:29:37 +0100
Subject: [PATCH 35/36] readme

---
 apps/remix-ide/ci/deploy_from_travis_remix-alpha.sh | 5 +++++
 apps/remix-ide/ci/deploy_from_travis_remix-beta.sh  | 5 +++++
 apps/remix-ide/ci/deploy_from_travis_remix-live.sh  | 5 +++++
 3 files changed, 15 insertions(+)

diff --git a/apps/remix-ide/ci/deploy_from_travis_remix-alpha.sh b/apps/remix-ide/ci/deploy_from_travis_remix-alpha.sh
index c415e8d8d4..93aacf0b03 100755
--- a/apps/remix-ide/ci/deploy_from_travis_remix-alpha.sh
+++ b/apps/remix-ide/ci/deploy_from_travis_remix-alpha.sh
@@ -8,6 +8,11 @@ cd dist/apps/remix-ide
 git init
 git config user.name "$COMMIT_AUTHOR"
 git config user.email "$COMMIT_AUTHOR_EMAIL"
+
+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
+
 zip -r remix-$SHA.zip .
 git add .
 git commit -m "Built website from {$SHA}."
diff --git a/apps/remix-ide/ci/deploy_from_travis_remix-beta.sh b/apps/remix-ide/ci/deploy_from_travis_remix-beta.sh
index 66bc6eb3b4..2db4dfafc7 100755
--- a/apps/remix-ide/ci/deploy_from_travis_remix-beta.sh
+++ b/apps/remix-ide/ci/deploy_from_travis_remix-beta.sh
@@ -8,6 +8,11 @@ cd dist/apps/remix-ide
 git init
 git config user.name "$COMMIT_AUTHOR"
 git config user.email "$COMMIT_AUTHOR_EMAIL"
+
+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
+
 zip -r remix-$SHA.zip .
 git add .
 git commit -m "Built website from {$SHA}."
diff --git a/apps/remix-ide/ci/deploy_from_travis_remix-live.sh b/apps/remix-ide/ci/deploy_from_travis_remix-live.sh
index f8e333d344..16f2e425c9 100755
--- a/apps/remix-ide/ci/deploy_from_travis_remix-live.sh
+++ b/apps/remix-ide/ci/deploy_from_travis_remix-live.sh
@@ -8,6 +8,11 @@ cd dist/apps/remix-ide
 git init
 git config user.name "$COMMIT_AUTHOR"
 git config user.email "$COMMIT_AUTHOR_EMAIL"
+
+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
+
 zip -r remix-$SHA.zip .
 git add .
 git commit -m "Built website from {$SHA}."

From ccf313b1ac6c865fafce03206e6ac1a013159fda Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Thu, 9 Mar 2023 15:30:23 +0100
Subject: [PATCH 36/36] rm test

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d3818d4d9c..9c3a936536 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -323,7 +323,7 @@ workflows:
       - predeploy:
           filters:
             branches:
-              only: ['master', 'remix_live', 'remix_beta', 'fixdeploy']
+              only: ['master', 'remix_live', 'remix_beta']
       - deploy-build:
           script: "live"
           name: "deploy-live"