workflows: update

.github/workflows/dockerhub-build-push.yml

@@ -3,7 +3,9 @@ name: Build & Push to DockerHub
 on:
   push:
     branches:
+      - master
       - testnet
+      - uat
 
 jobs:
   build:
@@ -12,22 +14,25 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Setup node
-        uses: actions/setup-node@v1
+
+      - uses: webfactory/ssh-agent@v0.4.0
+        with:
+          ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY_READ }}
 
       - name: Login to DockerHub Registry
         run: echo ${{ secrets.DOCKERHUB_ACCESS_TOKEN_SECRET }} | docker login -u ${{ secrets.DOCKERHUB_ACCESS_TOKEN_USERNAME}} --password-stdin
 
       - name: Build and push Rollup Services image to DockerHub
         run: |
-          docker build -f Dockerfile -t ethereumoptimism/rollup-services:latest .
-          docker push ethereumoptimism/rollup-services:latest
-
-      - name: Build and push Postgres image to DockerHub
-        run: |
-          cd db
-          docker build -f Dockerfile -t ethereumoptimism/postgres:latest .
-          docker push ethereumoptimism/postgres:latest
+          git clone https://github.com/ethereum-optimism/docker.git \
+              $HOME/docker
+          cd $HOME/docker
+          ./build.sh -s batch-submitter -b $GITHUB_HEAD_REF
+          if [ $GITHUB_HEAD_REF == 'master' ]; then
+              docker push ethereumoptimism/batch-submitter:latest
+          elif [[ $GITHUB_HEAD_REF == 'uat' || $GITHUB_HEAD_REF == 'testnet' ]]; then
+              docker push ethereumoptimism/batch-submitter:$GITHUB_HEAD_REF
+          fi
 
       - name: Logout of DockerHub
         run: docker logout

.github/workflows/integration.yml

@@ -20,24 +20,18 @@ jobs:
         with:
           ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY_READ }}
 
-      - name: Setup node
-        uses: actions/setup-node@v1
-
       - name: Build
         run: |
           git clone https://github.com/ethereum-optimism/optimism-integration.git \
               $HOME/optimism-integration \
               --recurse-submodules
-          REPO=$(echo $GITHUB_REPOSITORY | cut -d '/' -f2)
-          cd $HOME/optimism-integration/$REPO
-          REMOTE="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY.git"
-          git remote add gh $REMOTE
-          git fetch gh $GITHUB_SHA
-          git checkout $GITHUB_SHA
           cd $HOME/optimism-integration
+          GIT_COMMIT=$(git rev-parse HEAD | head -c 8)
+          echo "optimism-integration $GIT_COMMIT"
+          ./docker/build.sh -s batch-submitter -b $GITHUB_HEAD_REF
           ./docker/build.sh
 
       - name: Test
         run: |
           cd $HOME/optimism-integration
-          ./test.sh
+          BATCH_SUBMITTER_TAG=$GITHUB_HEAD_REF ./test.sh