Updating cirleci config

ethereum · Jun 10, 2020 · e17f397 · e17f397
1 parent 84e3b6f
commit e17f397
Show file tree

Hide file tree

Showing 3 changed files with 109 additions and 55 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,32 +2,25 @@
 #
 # Check https://circleci.com/docs/2.0/language-javascript/ for more details
 #
-aliases:
-  - &base-config
+version: 2
+jobs:
+  remix-ide-chrome:
     docker:
+      # specify the version you desire here
       - image: circleci/node:9.11.2-browsers
-    #resource_class: xlarge
-    environment:
-      - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
-      - COMMIT_AUTHOR: "Circle CI"
-      - FILES_TO_PACKAGE: "assets background.js build icon.png index.html manifest.json README.md soljson.js package.json"
-    working_directory: ~/remix-ide
-  - &base-config-node-10
-    docker: 
-    - image: circleci/node:10
-    #resource_class: xlarge
+
+      # Specify service dependencies here if necessary
+      # CircleCI maintains a library of pre-built images
+      # documented at https://circleci.com/docs/2.0/circleci-images/
+    resource_class: xlarge
+      # - image: circleci/mongo:3.4.4
     environment:
       - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
       - COMMIT_AUTHOR: "Circle CI"
       - FILES_TO_PACKAGE: "assets background.js build icon.png index.html manifest.json README.md soljson.js package.json"
     working_directory: ~/remix-ide
-  - &parallelism
-    parallelism: 1
-version: 2
-jobs:
-  remix-ide-chrome:
-    <<: *base-config
-    <<: *parallelism
+
+    parallelism: 20
     steps:
       - checkout
       - run: npm install
@@ -46,8 +39,22 @@ jobs:
           path: ./reports/screenshots
 
   remix-ide-firefox:
-    <<: *base-config
-    <<: *parallelism
+    docker:
+      # specify the version you desire here
+      - image: circleci/node:9.11.2-browsers
+
+      # Specify service dependencies here if necessary
+      # CircleCI maintains a library of pre-built images
+      # documented at https://circleci.com/docs/2.0/circleci-images/
+    resource_class: xlarge
+      # - image: circleci/mongo:3.4.4
+    environment:
+      - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
+      - COMMIT_AUTHOR: "Circle CI"
+      - FILES_TO_PACKAGE: "assets background.js build icon.png index.html manifest.json README.md soljson.js package.json"
+    working_directory: ~/remix-ide
+
+    parallelism: 20
     steps:
       - checkout
       - run: npm install
@@ -72,7 +79,20 @@ jobs:
           path: ./reports/screenshots
 
   remix-ide-run-deploy:
-    <<: *base-config
+    docker:
+      # specify the version you desire here
+      - image: circleci/node:9.11.2-browsers
+
+      # Specify service dependencies here if necessary
+      # CircleCI maintains a library of pre-built images
+      # documented at https://circleci.com/docs/2.0/circleci-images/
+    resource_class: xlarge
+      # - image: circleci/mongo:3.4.4
+    environment:
+      - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
+      - COMMIT_AUTHOR: "Circle CI"
+      - FILES_TO_PACKAGE: "assets background.js build icon.png index.html manifest.json README.md soljson.js package.json"
+    working_directory: ~/remix-ide
 
     steps:
       - checkout
@@ -89,8 +109,22 @@ jobs:
       - store_artifacts:
           path: ./reports/screenshots
 
+
   deploy-remix-live:
-    <<: *base-config
+    docker:
+      # specify the version you desire here
+      - image: circleci/node:9.11.2-browsers
+
+      # Specify service dependencies here if necessary
+      # CircleCI maintains a library of pre-built images
+      # documented at https://circleci.com/docs/2.0/circleci-images/
+    resource_class: xlarge
+      # - image: circleci/mongo:3.4.4
+    environment:
+      - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
+      - COMMIT_AUTHOR: "Circle CI"
+      - FILES_TO_PACKAGE: "assets background.js build icon.png index.html manifest.json README.md soljson.js package.json"
+    working_directory: ~/remix-ide
 
     steps:
       - checkout
@@ -106,7 +140,20 @@ jobs:
           path: ./reports/screenshots
 
   publish-docker:
-    <<: *base-config-node-10
+    docker:
+      # specify the version you desire here
+      - image: circleci/node:10.19.0-buster
+
+      # Specify service dependencies here if necessary
+      # CircleCI maintains a library of pre-built images
+      # documented at https://circleci.com/docs/2.0/circleci-images/
+    resource_class: xlarge
+      # - image: circleci/mongo:3.4.4
+    environment:
+      - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
+      - COMMIT_AUTHOR: "Circle CI"
+      - FILES_TO_PACKAGE: "assets background.js build icon.png index.html manifest.json README.md soljson.js package.json"
+    working_directory: ~/remix-ide
 
     steps:
       - checkout
@@ -116,7 +163,20 @@ jobs:
           path: ./reports/screenshots
 
   deploy-remix-alpha:
-    <<: *base-config
+    docker:
+      # specify the version you desire here
+      - image: circleci/node:9.11.2-browsers
+
+      # Specify service dependencies here if necessary
+      # CircleCI maintains a library of pre-built images
+    resource_class: xlarge
+      # documented at https://circleci.com/docs/2.0/circleci-images/
+      # - image: circleci/mongo:3.4.4
+    environment:
+      - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
+      - COMMIT_AUTHOR: "Circle CI"
+      - FILES_TO_PACKAGE: "assets background.js build icon.png index.html manifest.json README.md soljson.js package.json"
+    working_directory: ~/remix-ide
 
     steps:
       - checkout
@@ -135,27 +195,27 @@ workflows:
   version: 2
   build_all:
     jobs:
-      # - remix-ide-chrome
-      # - remix-ide-firefox
-      # - remix-ide-run-deploy
-      - publish-docker
-          # requires:
-          #   - remix-ide-chrome
-          #   - remix-ide-firefox
-          #   - remix-ide-run-deploy
-      # - deploy-remix-live:          
-          # requires:
-          #   - remix-ide-chrome
-            # - remix-ide-firefox
-            # - remix-ide-run-deploy
-      #     filters:
-      #       branches:
-      #         only: remix_live
-      # - deploy-remix-alpha:          
-          # requires:
-          #   - remix-ide-chrome
-            # - remix-ide-firefox
-            # - remix-ide-run-deploy
-          # filters:
-          #   branches:
-          #     only: master
+      - remix-ide-chrome
+      - remix-ide-firefox
+      - remix-ide-run-deploy
+      - publish-docker:
+          requires:
+            - remix-ide-chrome
+            - remix-ide-firefox
+            - remix-ide-run-deploy
+      - deploy-remix-live:          
+          requires:
+            - remix-ide-chrome
+            - remix-ide-firefox
+            - remix-ide-run-deploy
+          filters:
+            branches:
+              only: remix_live
+      - deploy-remix-alpha:          
+          requires:
+            - remix-ide-chrome
+            - remix-ide-firefox
+            - remix-ide-run-deploy
+          filters:
+            branches:
+              only: master
diff --git a/.env b/.env
@@ -1,4 +1,3 @@
 gist_token=<token>
 account_passphrase=<passphrase>
 account_password=<password>
-TAG=latest
diff --git a/ci/build_and_publish_docker_images.sh b/ci/build_and_publish_docker_images.sh
@@ -4,11 +4,6 @@ set -e
 # If not staging and master branch are existing
 export TAG="$CIRCLE_BRANCH"
 
-echo $TAG
-
-docker ps
-
 docker login --username $DOCKER_USER --password $DOCKER_PASS
 docker-compose build
-# docker build -f Dockerfile.dev -t remixproject/remix-ide:$TAG .
 docker push remixproject/remix-ide:$TAG