merge, then textfmt

vocdoni · Sep 20, 2023 · 8794939 · 8794939
1 parent bf4c662
commit 8794939
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -171,7 +171,10 @@ jobs:
                                   -o gocoverage-unit@${{ env.SHA }}.txt
           go tool covdata textfmt -i=gocoverage-integration@${{ env.SHA }}/ \
                                   -o gocoverage-integration@${{ env.SHA }}.txt
-          go tool covdata textfmt -i=gocoverage-unit@${{ env.SHA }}/,gocoverage-integration@${{ env.SHA }}/ \
+          # textfmt can't handle merging count mode with set mode files, but merge does
+          go tool covdata merge -i=gocoverage-unit@${{ env.SHA }}/,gocoverage-integration@${{ env.SHA }}/ \
+                                  -o ./
+          go tool covdata textfmt -i=./ \
                                   -o gocoverage-merged@${{ env.SHA }}.txt
       - name: Store code coverage artifact (all, textfmt)
         uses: actions/upload-artifact@v3