cleanup jobs

district0x · Nov 30, 2023 · 5e880bc · 5e880bc
1 parent 408f848
commit 5e880bc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 65 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,7 +1,4 @@
 version: 2.1
-orbs:
-  aws-cli: circleci/[email protected]
-  aws-ecr: circleci/[email protected]
 jobs:
   test:
     working_directory: ~/ethlance
@@ -21,13 +18,15 @@ jobs:
           POSTGRES_DB: ethlance-test
     steps:
       - checkout
+
       - restore_cache:
           name: Restore ethlance top-level npm package cache
           keys:
             - npm-dependencies-ethlance-{{ checksum "yarn.lock" }}
       - run:
           name: Install ethlance top-level node modules
           command: yarn install
+
       - restore_cache:
           name: Restore ethlance server npm package cache
           keys:
@@ -52,60 +51,8 @@ jobs:
           name: Run test suite
           command: bb run-server-tests
 
-  docker_build:
-      # working_directory: ~/ethlance
-      # docker:
-        # - image: account-id.dkr.ecr.us-east-1.amazonaws.com/org/repo:0.1
-        #   aws_auth:
-      machine:
-        image: ubuntu-2204:2022.07.1
-      steps:
-        - checkout
-        - aws-ecr/build_and_push_image:
-            attach_workspace: true
-            auth:
-              - aws-cli/setup:
-                  aws_access_key_id: $AWS_ACCESS_KEY_ID
-                  aws_secret_access_key: $AWS_SECRET_ACCESS_KEY
-            create_repo: false
-            dockerfile: docker-builds/server/Dockerfile
-            path: workspace
-            platform: linux/amd64
-            push_image: false
-            region: us-west-2
-            repo: my-sample-repo
-            tag: test
-            workspace_root: .
-
-        # - run:
-        #     name: Checkout ethlance-configs repo
-        #     command: |
-        #       git clone https://github.com/district0x/ethlance-config.git
-        #       cd ethlance-config
-        #       git checkout docker_build
-        # - run:
-        #     name: Copy configs
-        #     command: |
-        #       cp -r ethlance-config/config .
-        #       ls -lah config/
-        - run:
-            name: Build and push
-            command: |
-              echo "done building"
-              # docker build -t ${{ secrets.ECR_REGISTRY }}/ethlance-${{ matrix.image }}:latest-${{ matrix.env }} -f docker-builds/${{ matrix.image }}/Dockerfile --build-arg BUILD_ENV=${{ matrix.env }} .
-              # docker push ${{ secrets.ECR_REGISTRY }}/ethlance-${{ matrix.image }}:latest-${{ matrix.env }}
-
 workflows:
   build:
     jobs:
       - test:
-          context: district0x    
-      - docker_build:
-          context: district0x    
-          matrix:
-            parameters: 
-              image:
-              - server
-              - ui
-              env:
-                - qa
+          context: district0x    
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -16,11 +16,6 @@ jobs:
     runs-on: ubuntu-latest
     name: Ethlance build and test
     services:
-      # ganache:
-      #   image: trufflesuite/ganache:v7.9.1
-      #   options: >-
-      #     -v -m "easy leave proof verb wait patient fringe laptop intact opera slab shine", -p 8550, -b 0.5, --chain.allowUnlimitedContractSize=true 
-      #   # cmd: [-v -m "easy leave proof verb wait patient fringe laptop intact opera slab shine", -p 8550, -b 0.5, --chain.allowUnlimitedContractSize=true]
       ipfs-daemon:
         image: district0x/ipfs-daemon:latest
       postgres:
@@ -62,10 +57,6 @@ jobs:
         run: | 
           docker run --rm -d --name ganache  trufflesuite/ganache:v7.9.1 -v -m "easy leave proof verb wait patient fringe laptop intact opera slab shine" -p 8550 -b 0.5 --chain.allowUnlimitedContractSize=true
 
-      - name: Run ganache service
-        run: | 
-          docker run --rm -d --name ganache  trufflesuite/ganache:v7.9.1 -v -m "easy leave proof verb wait patient fringe laptop intact opera slab shine" -p 8550 -b 0.5 --chain.allowUnlimitedContractSize=true
-        
       - name: Get yarn cache directory for top-level ethlance packages
         id: yarn-cache-top-level-path
         run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT