Take care of Multi-Module Repositories

shogo82148 · May 23, 2020 · 4130e33 · 4130e33
1 parent 2378cbc
commit 4130e33
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -35,7 +35,7 @@ jobs:
         shell: bash
 
       - name: Test
-        run: go test -race -v -coverprofile=profile.cov ./...
+        run: make test
         env:
           GO111MODULE: "on"
         shell: bash

diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,7 @@
 
 # Test binary, built with `go test -c`
 *.test
+*.cov
 
 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out

diff --git a/Makefile b/Makefile
@@ -0,0 +1,12 @@
+DEP_XRAYAWS=$(shell cat xrayaws/go.mod | grep -v module | grep github.com/shogo82148/aws-xray-yasdk-go | cut -d' ' -f2)
+
+.PHONEY: test
+test:
+	go test -race -v -coverprofile=profile.cov ./...
+
+	# Take care of Multi-Module Repositories
+	# ref. https://github.com/golang/go/wiki/Modules#faqs--multi-module-repositories
+	cd xrayaws && go mod edit -replace github.com/shogo82148/aws-xray-yasdk-go@${DEP_XRAYAWS}=../ && \
+		go test -race -v -coverprofile=profile.cov ./... && \
+		go mod edit -dropreplace github.com/shogo82148/aws-xray-yasdk-go@${DEP_XRAYAWS}
+	cat xrayaws/profile.cov >> profile.cov
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,7 @@ @@
     # Test binary, built with `go test -c`
     *.test
+    *.cov
     # Output of the go coverage tool, specifically when used with LiteIDE
     *.out
@@ Expand Down @@