gitflows: update (ethereum#69)

* gitflows: update

* gitflows: setup ssh agent

* workflows: check out right branch

* gitflows: build correct branch

* gitflows: try GITHUB_HEAD_REF

* gitflows: remove extra step

* gitflows: fix the dockerhub push

* gitflows: remove scripts

* gitflows: echo the integration commit

* gitflows: fix docker push

* gitflows: don't build batch-submitter

* gitflows: handle merge to master

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

@@ -3,7 +3,9 @@ name: Build & Push to DockerHub
 on:
   push:
     branches:
+      - master
       - testnet
+      - uat
 
 jobs:
   build:
@@ -12,16 +14,26 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Setup node
-        uses: actions/setup-node@v1
+
+      - uses: webfactory/[email protected]
+        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 Optimistic Ethereum Node image to DockerHub
         run: |
-          docker build -t ethereumoptimism/optimistic-ethereum-node:latest .
-          docker push ethereumoptimism/optimistic-ethereum-node:latest
+          git clone https://github.com/ethereum-optimism/docker.git \
+              $HOME/docker
+          cd $HOME/docker
+          BRANCH=${GITHUB_REF##*/}
+          ./build.sh -s go-ethereum -b $BRANCH
+          if [ $GITHUB_HEAD_REF == 'master' ]; then
+              docker push ethereumoptimism/go-ethereum:latest
+          elif [[ $BRANCH == 'uat' || $BRANCH == 'testnet' ]]; then
+              docker push ethereumoptimism/go-ethereum:$BRANCH
+          fi
 
       - name: Logout of DockerHub
         run: docker logout

.github/workflows/integration.yml

@@ -20,24 +20,23 @@ 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
-          ./docker/build.sh
+          if [ -z $GITHUB_HEAD_REF ]; then
+              GITHUB_HEAD_REF=${GITHUB_REF##*/}
+          fi
+          GIT_COMMIT=$(git rev-parse HEAD | head -c 8)
+          echo "optimism-integration $GIT_COMMIT"
+          ./docker/build.sh -s go-ethereum -b $GITHUB_HEAD_REF
+          ./docker/build.sh -s hardhat
+          ./docker/build.sh -s deployer
+          ./docker/build.sh -s integration-tests
 
       - name: Test
         run: |
           cd $HOME/optimism-integration
-          ./test.sh
+          GETH_L2_TAG=$GITHUB_HEAD_REF ./test.sh