maybe preparing ~/.ocean is needed

oceanprotocol · Jun 16, 2021 · 1deac86 · 1deac86
1 parent 9ace412
commit 1deac86
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -32,7 +32,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     env:
-      ADDRESS_FILE: '${HOME}/.ocean/ocean-contracts/artifacts/address.json'
+      ADDRESS_FILE: ${{ github.workspace }}/.ocean/ocean-contracts/artifacts/address.json
       AQUARIUS_URI: 'http://172.15.0.5:5000'
     steps:
       - uses: actions/checkout@v2
@@ -57,19 +57,29 @@ jobs:
           path: 'barge'
 
       - name: Login to Docker Hub
+        if: ${{ env.DOCKERHUB_PASSWORD && env.DOCKERHUB_USERNAME }}
         run: |
-          if [[ -n "$DOCKERHUB_PASSWORD" && -n "$DOCKERHUB_USERNAME" ]]; then echo "Login to Docker Hub";echo "$DOCKERHUB_PASSWORD" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin; fi
+          echo "Login to Docker Hub";echo "$DOCKERHUB_PASSWORD" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
         env:
           DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
           DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
 
+      # - name: Prepare ~/.ocean
+      #   run: |
+      #     mkdir "${HOME}/.ocean/" &&
+      #     mkdir "${HOME}/.ocean/ocean-contracts/" &&
+      #     mkdir "${HOME}/.ocean/ocean-contracts/artifacts" &&
+      #     touch "${HOME}/.ocean/ocean-contracts/artifacts/address.json" &&
+      #     echo "{}" >> "${HOME}/.ocean/ocean-contracts/artifacts/address.json"
+
       - name: Run Barge
         working-directory: ${{ github.workspace }}/barge
         env:
           DEPLOY_CONTRACTS: 'true'
         run: |
           bash -x start_ocean.sh --with-provider2 --no-dashboard 2>&1 > start_ocean.log &
-          cd .. && ./scripts/waitforcontracts.sh
+          cd .. &
+          ./scripts/waitforcontracts.sh
 
       - name: Check running containers
         run: docker ps -a