From f045e7746a83297102420ec8f0822d5c50c2f937 Mon Sep 17 00:00:00 2001
From: ermyas <ermyas.abebe@consensys.net>
Date: Sun, 21 Nov 2021 12:37:35 +1100
Subject: [PATCH] Update CircleCI to use official Web3J release

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7cfeaf18..1a2452d1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,16 +3,6 @@ commands:
  prepare:
    steps:
       - checkout
-      - run:
-          name: Check out Web3j
-          command: |
-            git clone https://github.com/drinkcoffee/web3j-abi.git ../web3j-abi
-            git --git-dir=../web3j-abi/.git rev-parse HEAD > ../web3j-abi/headcommit
-      - restore_cache:
-          name: Restore cached Web3j gradle dependencies
-          keys:
-            - deps-web3j-{{ checksum "../web3j-abi/build.gradle" }}
-            - deps-web3j
       - restore_cache:
           name: Restore cached GPACT gradle dependencies
           keys:
@@ -21,8 +11,7 @@ commands:
       - restore_cache:
           name: Restore gradle build cache
           keys: # by decreasing rate of change...
-            - build-cache-{{ checksum "../web3j-abi/headcommit" }}-{{ .Revision }}
-            - build-cache-{{ checksum "../web3j-abi/headcommit" }}
+            - build-cache-{{ .Revision }}
             - build-cache
       - run:
          name: Install Solidity
@@ -66,18 +55,8 @@ jobs:
       - run:
           name: Assemble
           command: |
-            pushd .
-            # Build our Web3j
-            cd ../web3j-abi
-            ./gradlew --parallel --stacktrace --info --build-cache installDist
-            popd
             # Build the gpact
             ./gradlew --parallel --stacktrace --info --build-cache clean compileJava compileTestJava assemble
-      - save_cache:
-          name: Caching Web3j gradle dependencies
-          key: deps-web3j-{{ checksum "../web3j-abi/build.gradle" }}
-          paths:
-            - ../web3j/.gradle
       - save_cache:
           name: Caching GPACT gradle dependencies
           key: deps-gpact-{{ checksum "build.gradle" }}
@@ -85,22 +64,10 @@ jobs:
             - .gradle
       - save_cache:
           name: Caching gradle build cache
-          key: build-cache-{{ checksum "../besu/headcommit" }}-{{ checksum "../web3j-abi/headcommit" }}-{{ .Revision }}
+          key: build-cache-{{ checksum "../besu/headcommit" }}-{{ .Revision }}
           paths:
             - ~/.gradle
 
-#      - persist_to_workspace:
-#          root: ~/
-#          paths:
-#            - ./gpact
-#            - ./web3j-abi
-            #           - ./besu/build/install
-#      - store_artifacts:
-#          name: Distribution artifacts
-#          path:  build/distributions
-#          destination: distributions
-#          when: always
-
   # This job does not work as the remote docker runs out of memory when trying to run
   # the Besu container.
   unitTestsDocker:
@@ -109,12 +76,6 @@ jobs:
     working_directory: ~/gpact
     steps:
       - prepare
-      - run:
-          name: Build web3j
-          command: |
-            # Build our Web3j
-            cd ../web3j-abi
-            ./gradlew --parallel --stacktrace --info --build-cache installDist
       - setup_remote_docker:
           version: 20.10.6
           docker_layer_caching: true
@@ -189,14 +150,7 @@ jobs:
     steps:
       # The home directory is: /home/circleci/project
       # gpact is cloned to: /home/circleci/project/.
-      # web3j is cloned to: /home/circleci/web3j-abi
       - prepare
-      - run:
-          name: Build web3j
-          command: |
-            # Build our Web3j
-            cd ../web3j-abi
-            ./gradlew --parallel --stacktrace --info --build-cache installDist
       - run:
           name: Check code formatting
           command: ./gradlew solCheckFormat spotlessCheck