From 245350b020fb71583021c1d94736a718dcc9bfb5 Mon Sep 17 00:00:00 2001
From: Iaroslav Popov <ip13@sanger.ac.uk>
Date: Mon, 19 Aug 2024 15:18:40 +0100
Subject: [PATCH] debug

---
 .github/workflows/build_docker_image.yaml | 85 ++++++++++++-----------
 1 file changed, 43 insertions(+), 42 deletions(-)

diff --git a/.github/workflows/build_docker_image.yaml b/.github/workflows/build_docker_image.yaml
index 3ee8948..8c062c6 100644
--- a/.github/workflows/build_docker_image.yaml
+++ b/.github/workflows/build_docker_image.yaml
@@ -1,13 +1,14 @@
 # https://github.com/marketplace/actions/build-and-push-docker-images
 name: Build, Test and Push Docker Image
 
+  #      push:
+  #        paths:
+  #          - requirements.txt
+#          - Dockerfile
+
 jobs:
   base-image:
-    on:
-      push:
-        paths:
-          - requirements.txt
-          - Dockerfile
+    on: push
     runs-on: ubuntu-latest
     steps:
       - name: Set up Docker Buildx
@@ -25,40 +26,40 @@ jobs:
           name: BaseImage
           path: /tmp/base-image.tar
 
-  test-code:
-    on: push
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Download artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: BaseImage
-          path: /tmp
-      - name: Load image
-        run: |
-          docker load --input /tmp/base-image.tar
-      - name: Test code
-        run: |
-          docker run -v $(pwd):/code -w /code mercury/farmers-report-base:latest Rscript /code/tests/testthat.R
-
-  docker-image:
-    on:
-      pull_request:
-        branches:
-          - master
-    if: github.event.pull_request.merged == true
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ vars.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Build image and push
-        uses: docker/build-push-action@v5
-        with:
-          tags: mercury/farmers-report:latest
+#  test-code:
+#    on: push
+#    runs-on: ubuntu-latest
+#    steps:
+#      - name: Set up Docker Buildx
+#        uses: docker/setup-buildx-action@v3
+#      - name: Download artifact
+#        uses: actions/download-artifact@v4
+#        with:
+#          name: BaseImage
+#          path: /tmp
+#      - name: Load image
+#        run: |
+#          docker load --input /tmp/base-image.tar
+#      - name: Test code
+#        run: |
+#          docker run -v $(pwd):/code -w /code mercury/farmers-report-base:latest Rscript /code/tests/testthat.R
+#
+#  docker-image:
+#    on:
+#      pull_request:
+#        branches:
+#          - master
+#    if: github.event.pull_request.merged == true
+#    runs-on: ubuntu-latest
+#    steps:
+#      - name: Set up Docker Buildx
+#        uses: docker/setup-buildx-action@v3
+#      - name: Login to Docker Hub
+#        uses: docker/login-action@v3
+#        with:
+#          username: ${{ vars.DOCKERHUB_USERNAME }}
+#          password: ${{ secrets.DOCKERHUB_TOKEN }}
+#      - name: Build image and push
+#        uses: docker/build-push-action@v5
+#        with:
+#          tags: mercury/farmers-report:latest