Restore original build step

Author: cbrit

.github/workflows/integration-tests.yml

@@ -48,29 +48,22 @@ jobs:
         uses: docker/metadata-action@v3
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-sommelier
-      - name: build-and-push-linux-amd64
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: Dockerfile
-          push: true
-          platforms: linux/amd64
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          builder: ${{ steps.buildx.outputs.name }}
-      - name: build-and-push-linux-arm64
+      - name: build-and-push
         uses: docker/build-push-action@v2
         with:
           context: .
           file: Dockerfile
           push: true
-          platforms: linux/arm64/v8
+          platforms: linux/amd64, linux/arm64/v8
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           builder: ${{ steps.buildx.outputs.name }}
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-new
       - name: Move Docker cache
         run: |
           rm -rf /tmp/.buildx-cache
+          mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
   hardhat-build:
     permissions: