From 219a481a0fd106660816214080e283fb07bd0880 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Dudfield?= <renedudfield@microsoft.com>
Date: Tue, 2 Jul 2024 11:02:07 +0200
Subject: [PATCH 1/2] github: backend-test: Skip coverage steps unless PR
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Because they are not used on branch builds like on main.

Signed-off-by: René Dudfield <renedudfield@microsoft.com>
---
 .github/workflows/backend-test.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/backend-test.yml b/.github/workflows/backend-test.yml
index d68c93b353e..656af3df092 100644
--- a/.github/workflows/backend-test.yml
+++ b/.github/workflows/backend-test.yml
@@ -70,6 +70,7 @@ jobs:
         shell: bash
 
       - name: Get base branch code coverage
+        if: ${{ github.event_name }} == 'pull_request'
         run: |
           cd backend
           base_branch="${{ github.base_ref }}"
@@ -83,6 +84,7 @@ jobs:
         shell: bash
 
       - name: Compare code coverage
+        if: ${{ github.event_name }} == 'pull_request'
         run: |
           testcoverage="${{ env.coverage }}"
           base_coverage="${{ env.base_coverage }}"
@@ -101,6 +103,7 @@ jobs:
         shell: bash
 
       - name: Comment on PR
+        if: ${{ github.event_name }} == 'pull_request'
         run: |
           testcoverage="${{ env.coverage }}"
           base_coverage="${{ env.base_coverage }}"

From 4e756230be8109bbc06faebe2d0d32b0d8954613 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Dudfield?= <renedudfield@microsoft.com>
Date: Tue, 2 Jul 2024 11:12:38 +0200
Subject: [PATCH 2/2] github: backend-test: Add tracing to steps for easy
 debugging
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

So we can see which of the bash commands in a run block are failing.

Signed-off-by: René Dudfield <renedudfield@microsoft.com>
---
 .github/workflows/backend-test.yml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/.github/workflows/backend-test.yml b/.github/workflows/backend-test.yml
index 656af3df092..fdbd5e54e33 100644
--- a/.github/workflows/backend-test.yml
+++ b/.github/workflows/backend-test.yml
@@ -60,6 +60,7 @@ jobs:
 
       - name: Run tests and calculate code coverage
         run: |
+          set -x
           cd backend
           go test ./... -coverprofile=coverage.out -covermode=atomic -coverpkg=./...
           testcoverage=$(go tool cover -func=coverage.out | grep total | grep -Eo '[0-9]+\.[0-9]+')
@@ -72,6 +73,12 @@ jobs:
       - name: Get base branch code coverage
         if: ${{ github.event_name }} == 'pull_request'
         run: |
+          set -x
+          if [[ -z "${{ github.base_ref }}" ]]; then
+            echo "Base branch is empty. Skipping code coverage comparison."
+            exit 0
+          fi
+
           cd backend
           base_branch="${{ github.base_ref }}"
           testcoverage="${{ env.coverage }}"
@@ -86,6 +93,12 @@ jobs:
       - name: Compare code coverage
         if: ${{ github.event_name }} == 'pull_request'
         run: |
+          set -x
+          if [[ -z "${{ github.base_ref }}" ]]; then
+            echo "Base branch is empty. Skipping code coverage comparison."
+            exit 0
+          fi
+
           testcoverage="${{ env.coverage }}"
           base_coverage="${{ env.base_coverage }}"
           if [[ -z $testcoverage || -z $base_coverage ]]; then
@@ -105,6 +118,11 @@ jobs:
       - name: Comment on PR
         if: ${{ github.event_name }} == 'pull_request'
         run: |
+          set -x
+          if [[ -z "${{ github.base_ref }}" ]]; then
+            echo "Base branch is empty. Skipping code coverage comparison."
+            exit 0
+          fi
           testcoverage="${{ env.coverage }}"
           base_coverage="${{ env.base_coverage }}"
           coverage_diff="${{ env.coverage_diff }}"