Group push under main build action

.github/workflows/github_action_test_suite.yml

@@ -108,34 +108,32 @@ jobs:
         project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
         coverage-reports: ./testing_mygame/coverage.xml
 
-  docker:
+    # docker setup and push
-    runs-on: ubuntu-latest
+    -
-    steps:
+      name: Set up QEMU
-      -
+      uses: docker/setup-qemu-action@v1
-        name: Set up QEMU
+    -
-        uses: docker/setup-qemu-action@v1
+      name: Set up Docker Buildx
-      -
+      uses: docker/setup-buildx-action@v1
-        name: Set up Docker Buildx
+    -
-        uses: docker/setup-buildx-action@v1
+      name: Login to DockerHub
-      -
+      uses: docker/login-action@v1
-        name: Login to DockerHub
+      with:
-        uses: docker/login-action@v1
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
-        with:
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
+    -
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      name: Build and push for master
-      -
+      if: github.ref == 'refs/heads/master'
-        name: Build and push for master
+      id: docker_build_master
-        if: github.ref == 'refs/heads/master'
+      uses: docker/build-push-action@v2
-        id: docker_build_master
+      with:
-        uses: docker/build-push-action@v2
+        push: true
-        with:
+        tags: evennia/evennia:latest
-          push: true
+    -
-          tags: evennia/evennia:latest
+      name: Build and push for develop
-      -
+      if: github.ref == 'refs/heads/develop'
-        name: Build and push for develop
+      id: docker_build_develop
-        if: github.ref == 'refs/heads/develop'
+      uses: docker/build-push-action@v2
-        id: docker_build_develop
+      with:
-        uses: docker/build-push-action@v2
+        push: true
-        with:
+        tags: evennia/evennia:develop
-          push: true
-          tags: evennia/evennia:develop