From 0064ede556225c0abb2c9100b3f1dd25eb11af28 Mon Sep 17 00:00:00 2001 From: Tim Hogarty Date: Tue, 20 Aug 2024 16:16:12 -0700 Subject: [PATCH 1/2] Update main.go to allow build to work correctly --- Makefile | 2 +- main.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 8a2adf0e..bb783e40 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ build/go-junit-report-$(VERSION)-$(GOOS)-$(GOARCH).tar.gz: build/go-junit-report build/go-junit-report-$(VERSION)-windows-amd64.zip: build/go-junit-report.exe zip -j $@ build/go-junit-report.exe -release: test +release: $(MAKE) GOOS=linux GOARCH=amd64 build/go-junit-report-$(VERSION)-linux-amd64.tar.gz $(MAKE) GOOS=windows GOARCH=amd64 build/go-junit-report-$(VERSION)-windows-amd64.zip $(MAKE) GOOS=darwin GOARCH=amd64 build/go-junit-report-$(VERSION)-darwin-amd64.tar.gz diff --git a/main.go b/main.go index cecf899a..81d9a296 100644 --- a/main.go +++ b/main.go @@ -10,13 +10,13 @@ import ( "os" "strings" - "github.com/jstemmer/go-junit-report/v2/internal/gojunitreport" - "github.com/jstemmer/go-junit-report/v2/parser/gotest" + "github.com/thogarty/go-junit-report/v2/internal/gojunitreport" + "github.com/thogarty/go-junit-report/v2/parser/gotest" ) // Current release information printed by the -version flag. var ( - Version = "v2.2.0-dev" + Version = "v0.1.2" Revision = "HEAD" BuildTime string ) From 64a1af42b4dee9f39960621d02ff51923a2487b6 Mon Sep 17 00:00:00 2001 From: Tim Hogarty Date: Tue, 20 Aug 2024 16:17:59 -0700 Subject: [PATCH 2/2] replace all references to source repo to allow fork to be publishable --- CONTRIBUTING.md | 2 +- README.md | 20 ++++++++++---------- internal/gojunitreport/go-junit-report.go | 6 +++--- junit/junit.go | 2 +- junit/junit_test.go | 6 +++--- parser/gotest/benchmark.go | 2 +- parser/gotest/event.go | 2 +- parser/gotest/gotest.go | 4 ++-- parser/gotest/json.go | 4 ++-- parser/gotest/report_builder.go | 4 ++-- parser/gotest/report_builder_test.go | 4 ++-- testdata/017-race.txt | 6 +++--- testdata/017-report.xml | 6 +++--- testdata/032-failed-summary.txt | 2 +- testdata/032-report.xml | 6 +++--- testdata/generate-golden-reports.go | 2 +- 16 files changed, 39 insertions(+), 39 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 125d350e..5178739a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,7 +3,7 @@ ## Bug reports - Before reporting a bug, have a look at the [issue - list](https://github.com/jstemmer/go-junit-report/issues) to see if an issue + list](https://github.com/thogarty/go-junit-report/issues) to see if an issue already exists for your problem. - Include as much information as you can in the bug report, e.g.: the versions of go-junit-report and the Go compiler, how go-junit-report was called, what diff --git a/README.md b/README.md index c70b6712..39b8edad 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,9 @@ go-junit-report is a tool that converts [`go test`] output to a JUnit compatible XML report, suitable for use with applications such as [Jenkins]. -[![Build status](https://github.com/jstemmer/go-junit-report/actions/workflows/main.yml/badge.svg)](https://github.com/jstemmer/go-junit-report/actions) -[![Go Reference](https://pkg.go.dev/badge/github.com/jstemmer/go-junit-report/v2.svg)](https://pkg.go.dev/github.com/jstemmer/go-junit-report/v2) -[![Go Report Card](https://goreportcard.com/badge/github.com/jstemmer/go-junit-report/v2)](https://goreportcard.com/report/github.com/jstemmer/go-junit-report/v2) +[![Build status](https://github.com/thogarty/go-junit-report/actions/workflows/main.yml/badge.svg)](https://github.com/thogarty/go-junit-report/actions) +[![Go Reference](https://pkg.go.dev/badge/github.com/thogarty/go-junit-report/v2.svg)](https://pkg.go.dev/github.com/thogarty/go-junit-report/v2) +[![Go Report Card](https://goreportcard.com/badge/github.com/thogarty/go-junit-report/v2)](https://goreportcard.com/report/github.com/thogarty/go-junit-report/v2) ## Install from package (recommended) @@ -17,7 +17,7 @@ page. Download and install the latest stable version from source by running: ```bash -go install github.com/jstemmer/go-junit-report/v2@latest +go install github.com/thogarty/go-junit-report/v2@latest ``` ## Usage @@ -86,8 +86,8 @@ packages. This can be helpful if you want to use the `go test` output parser or create your own custom JUnit reports for example. See the package documentation on pkg.go.dev for more information: -- [github.com/jstemmer/go-junit-report/v2/parser/gotest] -- [github.com/jstemmer/go-junit-report/v2/junit] +- [github.com/thogarty/go-junit-report/v2/parser/gotest] +- [github.com/thogarty/go-junit-report/v2/junit] ## Changelog @@ -131,8 +131,8 @@ See [CONTRIBUTING.md]. [`go test`]: https://pkg.go.dev/cmd/go#hdr-Test_packages [Jenkins]: https://www.jenkins.io/ -[github.com/jstemmer/go-junit-report/v2/parser/gotest]: https://pkg.go.dev/github.com/jstemmer/go-junit-report/v2/parser/gotest -[github.com/jstemmer/go-junit-report/v2/junit]: https://pkg.go.dev/github.com/jstemmer/go-junit-report/v2/junit -[Releases]: https://github.com/jstemmer/go-junit-report/releases +[github.com/thogarty/go-junit-report/v2/parser/gotest]: https://pkg.go.dev/github.com/thogarty/go-junit-report/v2/parser/gotest +[github.com/thogarty/go-junit-report/v2/junit]: https://pkg.go.dev/github.com/thogarty/go-junit-report/v2/junit +[Releases]: https://github.com/thogarty/go-junit-report/releases [testing]: https://pkg.go.dev/testing -[CONTRIBUTING.md]: https://github.com/jstemmer/go-junit-report/blob/master/CONTRIBUTING.md +[CONTRIBUTING.md]: https://github.com/thogarty/go-junit-report/blob/master/CONTRIBUTING.md diff --git a/internal/gojunitreport/go-junit-report.go b/internal/gojunitreport/go-junit-report.go index df28d93f..061826fc 100644 --- a/internal/gojunitreport/go-junit-report.go +++ b/internal/gojunitreport/go-junit-report.go @@ -8,9 +8,9 @@ import ( "os" "time" - "github.com/jstemmer/go-junit-report/v2/gtr" - "github.com/jstemmer/go-junit-report/v2/junit" - "github.com/jstemmer/go-junit-report/v2/parser/gotest" + "github.com/thogarty/go-junit-report/v2/gtr" + "github.com/thogarty/go-junit-report/v2/junit" + "github.com/thogarty/go-junit-report/v2/parser/gotest" ) type parser interface { diff --git a/junit/junit.go b/junit/junit.go index e87b6ed0..f941e81a 100644 --- a/junit/junit.go +++ b/junit/junit.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/jstemmer/go-junit-report/v2/gtr" + "github.com/thogarty/go-junit-report/v2/gtr" ) // Testsuites is a collection of JUnit testsuites. diff --git a/junit/junit_test.go b/junit/junit_test.go index b1fd4e57..87192e76 100644 --- a/junit/junit_test.go +++ b/junit/junit_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/jstemmer/go-junit-report/v2/gtr" + "github.com/thogarty/go-junit-report/v2/gtr" "github.com/google/go-cmp/cmp" ) @@ -193,8 +193,8 @@ func TestWriteXML(t *testing.T) { var suites Testsuites - ts := Testsuite{Name:"Example"} - ts.AddTestcase(Testcase{Name: "Test", }) + ts := Testsuite{Name: "Example"} + ts.AddTestcase(Testcase{Name: "Test"}) suites.AddSuite(ts) var buf bytes.Buffer diff --git a/parser/gotest/benchmark.go b/parser/gotest/benchmark.go index e0568e5c..dd544167 100644 --- a/parser/gotest/benchmark.go +++ b/parser/gotest/benchmark.go @@ -3,7 +3,7 @@ package gotest import ( "time" - "github.com/jstemmer/go-junit-report/v2/gtr" + "github.com/thogarty/go-junit-report/v2/gtr" ) const ( diff --git a/parser/gotest/event.go b/parser/gotest/event.go index efe1ea33..a905afe0 100644 --- a/parser/gotest/event.go +++ b/parser/gotest/event.go @@ -3,7 +3,7 @@ package gotest import ( "time" - "github.com/jstemmer/go-junit-report/v2/parser/gotest/internal/reader" + "github.com/thogarty/go-junit-report/v2/parser/gotest/internal/reader" ) // Event is a single event in a Go test or benchmark. diff --git a/parser/gotest/gotest.go b/parser/gotest/gotest.go index 1894758a..39cc3740 100644 --- a/parser/gotest/gotest.go +++ b/parser/gotest/gotest.go @@ -10,8 +10,8 @@ import ( "strings" "time" - "github.com/jstemmer/go-junit-report/v2/gtr" - "github.com/jstemmer/go-junit-report/v2/parser/gotest/internal/reader" + "github.com/thogarty/go-junit-report/v2/gtr" + "github.com/thogarty/go-junit-report/v2/parser/gotest/internal/reader" ) const ( diff --git a/parser/gotest/json.go b/parser/gotest/json.go index bb0ccece..35d8efe9 100644 --- a/parser/gotest/json.go +++ b/parser/gotest/json.go @@ -3,8 +3,8 @@ package gotest import ( "io" - "github.com/jstemmer/go-junit-report/v2/gtr" - "github.com/jstemmer/go-junit-report/v2/parser/gotest/internal/reader" + "github.com/thogarty/go-junit-report/v2/gtr" + "github.com/thogarty/go-junit-report/v2/parser/gotest/internal/reader" ) // NewJSONParser returns a new Go test json output parser. diff --git a/parser/gotest/report_builder.go b/parser/gotest/report_builder.go index 51cfa9ac..94b92295 100644 --- a/parser/gotest/report_builder.go +++ b/parser/gotest/report_builder.go @@ -6,8 +6,8 @@ import ( "strings" "time" - "github.com/jstemmer/go-junit-report/v2/gtr" - "github.com/jstemmer/go-junit-report/v2/parser/gotest/internal/collector" + "github.com/thogarty/go-junit-report/v2/gtr" + "github.com/thogarty/go-junit-report/v2/parser/gotest/internal/collector" ) const ( diff --git a/parser/gotest/report_builder_test.go b/parser/gotest/report_builder_test.go index bd24bf5e..280cdeca 100644 --- a/parser/gotest/report_builder_test.go +++ b/parser/gotest/report_builder_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/jstemmer/go-junit-report/v2/gtr" - "github.com/jstemmer/go-junit-report/v2/parser/gotest/internal/collector" + "github.com/thogarty/go-junit-report/v2/gtr" + "github.com/thogarty/go-junit-report/v2/parser/gotest/internal/collector" "github.com/google/go-cmp/cmp" ) diff --git a/testdata/017-race.txt b/testdata/017-race.txt index aa3af73b..9a339ab2 100644 --- a/testdata/017-race.txt +++ b/testdata/017-race.txt @@ -4,11 +4,11 @@ WARNING: DATA RACE Write at 0x00c000138168 by goroutine 8: package/race.TestRace.func1() - /src/github.com/jstemmer/go-junit-report/testdata/src/race/race_test.go:9 +0x39 + /src/github.com/thogarty/go-junit-report/testdata/src/race/race_test.go:9 +0x39 Previous write at 0x00c000138168 by goroutine 7: package/race.TestRace() - /src/github.com/jstemmer/go-junit-report/testdata/src/race/race_test.go:12 +0x105 + /src/github.com/thogarty/go-junit-report/testdata/src/race/race_test.go:12 +0x105 testing.tRunner() /go-src/go1.18/src/testing/testing.go:1439 +0x213 testing.(*T).Run.func1() @@ -16,7 +16,7 @@ Previous write at 0x00c000138168 by goroutine 7: Goroutine 8 (running) created at: package/race.TestRace() - /src/github.com/jstemmer/go-junit-report/testdata/src/race/race_test.go:8 +0xfb + /src/github.com/thogarty/go-junit-report/testdata/src/race/race_test.go:8 +0xfb testing.tRunner() /go-src/go1.18/src/testing/testing.go:1439 +0x213 testing.(*T).Run.func1() diff --git a/testdata/017-report.xml b/testdata/017-report.xml index 71297aac..945316ad 100644 --- a/testdata/017-report.xml +++ b/testdata/017-report.xml @@ -10,11 +10,11 @@ WARNING: DATA RACE Write at 0x00c000138168 by goroutine 8: package/race.TestRace.func1() - /src/github.com/jstemmer/go-junit-report/testdata/src/race/race_test.go:9 +0x39 + /src/github.com/thogarty/go-junit-report/testdata/src/race/race_test.go:9 +0x39 Previous write at 0x00c000138168 by goroutine 7: package/race.TestRace() - /src/github.com/jstemmer/go-junit-report/testdata/src/race/race_test.go:12 +0x105 + /src/github.com/thogarty/go-junit-report/testdata/src/race/race_test.go:12 +0x105 testing.tRunner() /go-src/go1.18/src/testing/testing.go:1439 +0x213 testing.(*T).Run.func1() @@ -22,7 +22,7 @@ Previous write at 0x00c000138168 by goroutine 7: Goroutine 8 (running) created at: package/race.TestRace() - /src/github.com/jstemmer/go-junit-report/testdata/src/race/race_test.go:8 +0xfb + /src/github.com/thogarty/go-junit-report/testdata/src/race/race_test.go:8 +0xfb testing.tRunner() /go-src/go1.18/src/testing/testing.go:1439 +0x213 testing.(*T).Run.func1() diff --git a/testdata/032-failed-summary.txt b/testdata/032-failed-summary.txt index d0963960..902658be 100644 --- a/testdata/032-failed-summary.txt +++ b/testdata/032-failed-summary.txt @@ -2,4 +2,4 @@ --- PASS: TestOne (0.00s) PASS panic: panic -FAIL github.com/jstemmer/test/failedsummary 0.005s +FAIL github.com/thogarty/test/failedsummary 0.005s diff --git a/testdata/032-report.xml b/testdata/032-report.xml index e9d57824..9882977a 100644 --- a/testdata/032-report.xml +++ b/testdata/032-report.xml @@ -1,11 +1,11 @@ - + - - + + diff --git a/testdata/generate-golden-reports.go b/testdata/generate-golden-reports.go index 7bec1dda..c22a3587 100644 --- a/testdata/generate-golden-reports.go +++ b/testdata/generate-golden-reports.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/jstemmer/go-junit-report/v2/internal/gojunitreport" + "github.com/thogarty/go-junit-report/v2/internal/gojunitreport" ) var verbose bool