From 1c764022476e9a0fefad5f8c8c947ff3e9e39f0d Mon Sep 17 00:00:00 2001 From: Dan Davison Date: Thu, 12 Sep 2024 05:56:09 -0400 Subject: [PATCH 1/9] Dump junit xml --- .github/workflows/ci.yml | 17 ++++++++++++++--- internal/cmd/build/main.go | 22 +++++++++++++++++++--- 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 11cf482c0..5c84f12c4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,23 +36,26 @@ jobs: with: go-version: ${{ matrix.go-version }} + - name: Create junit-xml directory + run: mkdir junit-xml + - name: Check run: go run . check working-directory: ./internal/cmd/build - name: Unit test - run: go run . unit-test -coverage=${{ matrix.uploadCoverage && 'true' || 'false' }} + run: go run . unit-test -coverage=${{ matrix.uploadCoverage && 'true' || 'false' }} -junitfile junit-xml/${{matrix.os}}-${{matrix.go-version}} working-directory: ./internal/cmd/build - name: Integration tests (without cache) - run: go run . integration-test -dev-server + run: go run . integration-test -dev-server -junitfile junit-xml/${{matrix.os}}-${{matrix.go-version}}-nocache working-directory: ./internal/cmd/build env: WORKFLOW_CACHE_SIZE: "0" TEMPORAL_COVERAGE_FILE: ${{ matrix.uploadCoverage && 'integ_test_zero_cache_cover.out' || '' }} - name: Integration tests (with cache) - run: go run . integration-test -dev-server + run: go run . integration-test -dev-server -junitfile junit-xml/${{matrix.os}}-${{matrix.go-version}}-cache working-directory: ./internal/cmd/build env: TEMPORAL_COVERAGE_FILE: ${{ matrix.uploadCoverage && 'integ_test_normal_cache_cover.out' || '' }} @@ -70,6 +73,14 @@ jobs: file: coverage.out format: golang + - name: 'Upload junit-xml artifacts' + uses: actions/upload-artifact@v4 + if: always() + with: + name: junit-xml--${{github.run_id}}--${{github.run_attempt}}--${{matrix.os}}-${{matrix.go-version}} + path: junit-xml + retention-days: 14 + - name: Docker compose - checkout if: ${{ matrix.testDockerCompose }} uses: actions/checkout@v4 diff --git a/internal/cmd/build/main.go b/internal/cmd/build/main.go index 0a1a07fa9..2df49c57d 100644 --- a/internal/cmd/build/main.go +++ b/internal/cmd/build/main.go @@ -117,10 +117,15 @@ func (b *builder) integrationTest() error { runFlag := flagSet.String("run", "", "Passed to go test as -run") devServerFlag := flagSet.Bool("dev-server", false, "Use an embedded dev server") coverageFileFlag := flagSet.String("coverage-file", "", "If set, enables coverage output to this filename") + junitFileFlag := flagSet.String("junitfile", "", "If set, a path prefix to which junit-style xml files should be written") if err := flagSet.Parse(os.Args[2:]); err != nil { return fmt.Errorf("failed parsing flags: %w", err) } + gotestsum, err := b.getInstalledTool("gotest.tools/gotestsum") + if err != nil { + return fmt.Errorf("failed getting gotestsum: %w", err) + } // Also accept coverage file as env var if env := strings.TrimSpace(os.Getenv("TEMPORAL_COVERAGE_FILE")); *coverageFileFlag == "" && env != "" { *coverageFileFlag = env @@ -171,7 +176,10 @@ func (b *builder) integrationTest() error { } // Run integration test - args := []string{"go", "test", "-tags", "protolegacy", "-count", "1", "-race", "-v", "-timeout", "10m"} + args := []string{gotestsum, "-tags", "protolegacy", "-count", "1", "-race", "-v", "-timeout", "10m"} + if *junitFileFlag != "" { + args = append(args, "--junitfile", *junitFileFlag+"-integration-test.xml") + } if *runFlag != "" { args = append(args, "-run", *runFlag) } @@ -234,14 +242,19 @@ func (b *builder) unitTest() error { flagSet := flag.NewFlagSet("unit-test", flag.ContinueOnError) runFlag := flagSet.String("run", "", "Passed to go test as -run") coverageFlag := flagSet.Bool("coverage", false, "If set, enables coverage output") + junitFileFlag := flagSet.String("junitfile", "", "If set, a path prefix to which junit-style xml files should be written") if err := flagSet.Parse(os.Args[2:]); err != nil { return fmt.Errorf("failed parsing flags: %w", err) } + gotestsum, err := b.getInstalledTool("gotest.tools/gotestsum") + if err != nil { + return fmt.Errorf("failed getting gotestsum: %w", err) + } // Find every non ./test-prefixed package that has a test file testDirMap := map[string]struct{}{} var testDirs []string - err := fs.WalkDir(os.DirFS(b.rootDir), ".", func(p string, d fs.DirEntry, err error) error { + err = fs.WalkDir(os.DirFS(b.rootDir), ".", func(p string, d fs.DirEntry, err error) error { if !strings.HasPrefix(p, "test") && strings.HasSuffix(p, "_test.go") { dir := path.Dir(p) if _, ok := testDirMap[dir]; !ok { @@ -267,7 +280,10 @@ func (b *builder) unitTest() error { log.Printf("Running unit tests in dirs: %v", testDirs) for _, testDir := range testDirs { // Run unit test - args := []string{"go", "test", "-tags", "protolegacy", "-count", "1", "-race", "-v", "-timeout", "15m"} + args := []string{gotestsum, "-tags", "protolegacy", "-count", "1", "-race", "-v", "-timeout", "15m"} + if *junitFileFlag != "" { + args = append(args, "--junitfile", *junitFileFlag+strings.ReplaceAll(testDir, "/", "-")+"unit-test.xml") + } if *runFlag != "" { args = append(args, "-run", *runFlag) } From b21390a1886add40408fbc9be619e27cc432ebce Mon Sep 17 00:00:00 2001 From: Dan Davison Date: Thu, 12 Sep 2024 06:08:29 -0400 Subject: [PATCH 2/9] TEMP: just install gotestsum in ci.yml --- .github/workflows/ci.yml | 3 +++ internal/cmd/build/main.go | 14 +++----------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5c84f12c4..448eeaf0f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,6 +36,9 @@ jobs: with: go-version: ${{ matrix.go-version }} + - name: Install gotestsum + run: go install gotest.tools/gotestsum@latest + - name: Create junit-xml directory run: mkdir junit-xml diff --git a/internal/cmd/build/main.go b/internal/cmd/build/main.go index 2df49c57d..7628edd9a 100644 --- a/internal/cmd/build/main.go +++ b/internal/cmd/build/main.go @@ -122,10 +122,6 @@ func (b *builder) integrationTest() error { return fmt.Errorf("failed parsing flags: %w", err) } - gotestsum, err := b.getInstalledTool("gotest.tools/gotestsum") - if err != nil { - return fmt.Errorf("failed getting gotestsum: %w", err) - } // Also accept coverage file as env var if env := strings.TrimSpace(os.Getenv("TEMPORAL_COVERAGE_FILE")); *coverageFileFlag == "" && env != "" { *coverageFileFlag = env @@ -176,7 +172,7 @@ func (b *builder) integrationTest() error { } // Run integration test - args := []string{gotestsum, "-tags", "protolegacy", "-count", "1", "-race", "-v", "-timeout", "10m"} + args := []string{"gotestsum", "-tags", "protolegacy", "-count", "1", "-race", "-v", "-timeout", "10m"} if *junitFileFlag != "" { args = append(args, "--junitfile", *junitFileFlag+"-integration-test.xml") } @@ -247,14 +243,10 @@ func (b *builder) unitTest() error { return fmt.Errorf("failed parsing flags: %w", err) } - gotestsum, err := b.getInstalledTool("gotest.tools/gotestsum") - if err != nil { - return fmt.Errorf("failed getting gotestsum: %w", err) - } // Find every non ./test-prefixed package that has a test file testDirMap := map[string]struct{}{} var testDirs []string - err = fs.WalkDir(os.DirFS(b.rootDir), ".", func(p string, d fs.DirEntry, err error) error { + err := fs.WalkDir(os.DirFS(b.rootDir), ".", func(p string, d fs.DirEntry, err error) error { if !strings.HasPrefix(p, "test") && strings.HasSuffix(p, "_test.go") { dir := path.Dir(p) if _, ok := testDirMap[dir]; !ok { @@ -280,7 +272,7 @@ func (b *builder) unitTest() error { log.Printf("Running unit tests in dirs: %v", testDirs) for _, testDir := range testDirs { // Run unit test - args := []string{gotestsum, "-tags", "protolegacy", "-count", "1", "-race", "-v", "-timeout", "15m"} + args := []string{"gotestsum", "-tags", "protolegacy", "-count", "1", "-race", "-v", "-timeout", "15m"} if *junitFileFlag != "" { args = append(args, "--junitfile", *junitFileFlag+strings.ReplaceAll(testDir, "/", "-")+"unit-test.xml") } From f83ff640d45a4a9a0db453c0cf32621d58cb30eb Mon Sep 17 00:00:00 2001 From: Dan Davison Date: Thu, 12 Sep 2024 06:14:07 -0400 Subject: [PATCH 3/9] Invoke gotestsum correctly --- internal/cmd/build/main.go | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/internal/cmd/build/main.go b/internal/cmd/build/main.go index 7628edd9a..78cc610cc 100644 --- a/internal/cmd/build/main.go +++ b/internal/cmd/build/main.go @@ -117,7 +117,7 @@ func (b *builder) integrationTest() error { runFlag := flagSet.String("run", "", "Passed to go test as -run") devServerFlag := flagSet.Bool("dev-server", false, "Use an embedded dev server") coverageFileFlag := flagSet.String("coverage-file", "", "If set, enables coverage output to this filename") - junitFileFlag := flagSet.String("junitfile", "", "If set, a path prefix to which junit-style xml files should be written") + junitFileFlag := flagSet.String("junitfile", "junit-xml", "If set, a path prefix to which junit-style xml files should be written") if err := flagSet.Parse(os.Args[2:]); err != nil { return fmt.Errorf("failed parsing flags: %w", err) } @@ -172,10 +172,7 @@ func (b *builder) integrationTest() error { } // Run integration test - args := []string{"gotestsum", "-tags", "protolegacy", "-count", "1", "-race", "-v", "-timeout", "10m"} - if *junitFileFlag != "" { - args = append(args, "--junitfile", *junitFileFlag+"-integration-test.xml") - } + args := []string{"gotestsum", "--junitfile", *junitFileFlag + "-integration-test.xml", "--", "-tags", "protolegacy", "-count", "1", "-race", "-v", "-timeout", "10m"} if *runFlag != "" { args = append(args, "-run", *runFlag) } @@ -238,7 +235,7 @@ func (b *builder) unitTest() error { flagSet := flag.NewFlagSet("unit-test", flag.ContinueOnError) runFlag := flagSet.String("run", "", "Passed to go test as -run") coverageFlag := flagSet.Bool("coverage", false, "If set, enables coverage output") - junitFileFlag := flagSet.String("junitfile", "", "If set, a path prefix to which junit-style xml files should be written") + junitFileFlag := flagSet.String("junitfile", "junit-xml", "If set, a path prefix to which junit-style xml files should be written") if err := flagSet.Parse(os.Args[2:]); err != nil { return fmt.Errorf("failed parsing flags: %w", err) } @@ -272,9 +269,10 @@ func (b *builder) unitTest() error { log.Printf("Running unit tests in dirs: %v", testDirs) for _, testDir := range testDirs { // Run unit test - args := []string{"gotestsum", "-tags", "protolegacy", "-count", "1", "-race", "-v", "-timeout", "15m"} - if *junitFileFlag != "" { - args = append(args, "--junitfile", *junitFileFlag+strings.ReplaceAll(testDir, "/", "-")+"unit-test.xml") + args := []string{ + "gotestsum", + "--junitfile", *junitFileFlag + strings.ReplaceAll(testDir, "/", "-") + "unit-test.xml", "--", + "-tags", "protolegacy", "-count", "1", "-race", "-v", "-timeout", "15m", } if *runFlag != "" { args = append(args, "-run", *runFlag) From b7ff8a3b250a121bf23c1672463d66151abdc527 Mon Sep 17 00:00:00 2001 From: Dan Davison Date: Thu, 12 Sep 2024 06:23:30 -0400 Subject: [PATCH 4/9] go get gotest.tools/gotestsum --- internal/cmd/build/go.mod | 9 ++++ internal/cmd/build/go.sum | 87 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+) diff --git a/internal/cmd/build/go.mod b/internal/cmd/build/go.mod index 428ce43e7..d2e90910d 100644 --- a/internal/cmd/build/go.mod +++ b/internal/cmd/build/go.mod @@ -10,13 +10,20 @@ require ( ) require ( + github.com/bitfield/gotestdox v0.2.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect + github.com/dnephin/pflag v1.0.7 // indirect github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a // indirect + github.com/fatih/color v1.16.0 // indirect + github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/mock v1.6.0 // indirect + github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect github.com/google/uuid v1.6.0 // indirect github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect + github.com/mattn/go-colorable v0.1.13 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect github.com/nexus-rpc/sdk-go v0.0.10 // indirect github.com/pborman/uuid v1.2.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect @@ -30,6 +37,7 @@ require ( golang.org/x/net v0.28.0 // indirect golang.org/x/sync v0.8.0 // indirect golang.org/x/sys v0.24.0 // indirect + golang.org/x/term v0.23.0 // indirect golang.org/x/text v0.17.0 // indirect golang.org/x/time v0.5.0 // indirect golang.org/x/tools v0.21.1-0.20240531212143-b6235391adb3 // indirect @@ -38,6 +46,7 @@ require ( google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect + gotest.tools/gotestsum v1.12.0 // indirect ) replace go.temporal.io/sdk => ../../../ diff --git a/internal/cmd/build/go.sum b/internal/cmd/build/go.sum index 45386e910..057c95b84 100644 --- a/internal/cmd/build/go.sum +++ b/internal/cmd/build/go.sum @@ -3,18 +3,27 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c h1:pxW6RcqyfI9/kWtOwnv/G+AzdKuy2ZrqINhenH4HyNs= github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= +github.com/bitfield/gotestdox v0.2.2 h1:x6RcPAbBbErKLnapz1QeAlf3ospg8efBsedU93CDsnE= +github.com/bitfield/gotestdox v0.2.2/go.mod h1:D+gwtS0urjBrzguAkTM2wodsTQYFHdpx8eqRJ3N+9pY= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/dnephin/pflag v1.0.7 h1:oxONGlWxhmUct0YzKTgrpQv9AUA1wtPBn7zuSjJqptk= +github.com/dnephin/pflag v1.0.7/go.mod h1:uxE91IoWURlOiTUIA8Mq5ZZkAv3dPUfZNaT80Zm7OQE= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a h1:yDWHCSQ40h88yih2JAcL6Ls/kVkSE8GFACTGVnMPruw= github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a/go.mod h1:7Ga40egUymuWXxAe151lTNnCv97MddSOVsjpPPkityA= +github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= +github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= +github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= +github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= +github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= @@ -30,8 +39,11 @@ github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaW github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4= +github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -51,6 +63,13 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= +github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/nexus-rpc/sdk-go v0.0.10 h1:7jEPUlsghxoD4OJ2H8YbFJ1t4wbxsUef7yZgBfyY3uA= github.com/nexus-rpc/sdk-go v0.0.10/go.mod h1:TpfkM2Cw0Rlk9drGkoiSMpFqflKTiQLWUNyKJjF8mKQ= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= @@ -78,6 +97,7 @@ github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.temporal.io/api v1.38.0 h1:L5i+Ai7UoBa2Gq/goVHLY32064AgawxPDLkKm4I7fu4= go.temporal.io/api v1.38.0/go.mod h1:fmh06EjstyrPp6SHbjJo7yYHBfHamPE4SytM+2NRejc= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= @@ -87,6 +107,12 @@ go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= +golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= +golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= +golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= +golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20240409090435-93d18d7e34b8 h1:ESSUROHIBHg7USnszlcdmjBEwdMj9VUvU+OPk4yl2mc= golang.org/x/exp v0.0.0-20240409090435-93d18d7e34b8/go.mod h1:/lliqkxwWAhPjf5oSOIJup2XcqJaw8RGS6k3TGEc7GI= @@ -99,6 +125,13 @@ golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.16.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -109,7 +142,16 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= +golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -119,6 +161,10 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -129,12 +175,44 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= +golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o= +golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= +golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= +golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= +golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU= +golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= @@ -149,6 +227,12 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/tools v0.11.0/go.mod h1:anzJrxPjNtfgiYQYirP2CPGzGLxrH2u2QBhn6Bf3qY8= +golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= +golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc= golang.org/x/tools v0.21.1-0.20240531212143-b6235391adb3 h1:SHq4Rl+B7WvyM4XODon1LXtP7gcG49+7Jubt1gWWswY= golang.org/x/tools v0.21.1-0.20240531212143-b6235391adb3/go.mod h1:bqv7PJ/TtlrzgJKhOAGdDUkUltQapRik/UEHubLVBWo= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -183,6 +267,9 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gotest.tools/gotestsum v1.12.0 h1:CmwtaGDkHxrZm4Ib0Vob89MTfpc3GrEFMJKovliPwGk= +gotest.tools/gotestsum v1.12.0/go.mod h1:fAvqkSptospfSbQw26CTYzNwnsE/ztqLeyhP0h67ARY= +gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.5.0 h1:29uoiIormS3Z6R+t56STz/oI4v+mB51TSmEOdJPgRnE= From 85f554487820254574724c6b9bdb1ddb78dc7ef1 Mon Sep 17 00:00:00 2001 From: Dan Davison Date: Thu, 12 Sep 2024 06:26:35 -0400 Subject: [PATCH 5/9] Install gotestsum locally --- .github/workflows/ci.yml | 3 --- internal/cmd/build/main.go | 22 ++++++++++++++++++---- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 448eeaf0f..5c84f12c4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,9 +36,6 @@ jobs: with: go-version: ${{ matrix.go-version }} - - name: Install gotestsum - run: go install gotest.tools/gotestsum@latest - - name: Create junit-xml directory run: mkdir junit-xml diff --git a/internal/cmd/build/main.go b/internal/cmd/build/main.go index 78cc610cc..2048af229 100644 --- a/internal/cmd/build/main.go +++ b/internal/cmd/build/main.go @@ -122,6 +122,10 @@ func (b *builder) integrationTest() error { return fmt.Errorf("failed parsing flags: %w", err) } + gotestsum, err := b.getInstalledTool("gotest.tools/gotestsum") + if err != nil { + return fmt.Errorf("failed getting gotestsum: %w", err) + } // Also accept coverage file as env var if env := strings.TrimSpace(os.Getenv("TEMPORAL_COVERAGE_FILE")); *coverageFileFlag == "" && env != "" { *coverageFileFlag = env @@ -172,7 +176,12 @@ func (b *builder) integrationTest() error { } // Run integration test - args := []string{"gotestsum", "--junitfile", *junitFileFlag + "-integration-test.xml", "--", "-tags", "protolegacy", "-count", "1", "-race", "-v", "-timeout", "10m"} + args := []string{ + gotestsum, + "--junitfile", *junitFileFlag + "-integration-test.xml", + "--", + "-tags", "protolegacy", "-count", "1", "-race", "-v", "-timeout", "10m", + } if *runFlag != "" { args = append(args, "-run", *runFlag) } @@ -240,10 +249,14 @@ func (b *builder) unitTest() error { return fmt.Errorf("failed parsing flags: %w", err) } + gotestsum, err := b.getInstalledTool("gotest.tools/gotestsum") + if err != nil { + return fmt.Errorf("failed getting gotestsum: %w", err) + } // Find every non ./test-prefixed package that has a test file testDirMap := map[string]struct{}{} var testDirs []string - err := fs.WalkDir(os.DirFS(b.rootDir), ".", func(p string, d fs.DirEntry, err error) error { + err = fs.WalkDir(os.DirFS(b.rootDir), ".", func(p string, d fs.DirEntry, err error) error { if !strings.HasPrefix(p, "test") && strings.HasSuffix(p, "_test.go") { dir := path.Dir(p) if _, ok := testDirMap[dir]; !ok { @@ -270,8 +283,9 @@ func (b *builder) unitTest() error { for _, testDir := range testDirs { // Run unit test args := []string{ - "gotestsum", - "--junitfile", *junitFileFlag + strings.ReplaceAll(testDir, "/", "-") + "unit-test.xml", "--", + gotestsum, + "--junitfile", *junitFileFlag + strings.ReplaceAll(testDir, "/", "-") + "unit-test.xml", + "--", "-tags", "protolegacy", "-count", "1", "-race", "-v", "-timeout", "15m", } if *runFlag != "" { From 240b5cae8a9043c86165fa1dd5e2189e2ea79c0a Mon Sep 17 00:00:00 2001 From: Dan Davison Date: Thu, 12 Sep 2024 10:10:43 -0400 Subject: [PATCH 6/9] Pass file stem from ci.yml; allow build script to control output dir --- .github/workflows/ci.yml | 11 ++++------- internal/cmd/build/main.go | 34 ++++++++++++++++++++++++++-------- 2 files changed, 30 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5c84f12c4..44b08c39c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,26 +36,23 @@ jobs: with: go-version: ${{ matrix.go-version }} - - name: Create junit-xml directory - run: mkdir junit-xml - - name: Check run: go run . check working-directory: ./internal/cmd/build - name: Unit test - run: go run . unit-test -coverage=${{ matrix.uploadCoverage && 'true' || 'false' }} -junitfile junit-xml/${{matrix.os}}-${{matrix.go-version}} + run: go run . unit-test -coverage=${{ matrix.uploadCoverage && 'true' || 'false' }} -junit-file-stem ${{matrix.os}}-${{matrix.go-version}} working-directory: ./internal/cmd/build - name: Integration tests (without cache) - run: go run . integration-test -dev-server -junitfile junit-xml/${{matrix.os}}-${{matrix.go-version}}-nocache + run: go run . integration-test -dev-server -junit-file-stem ${{matrix.os}}-${{matrix.go-version}}-nocache working-directory: ./internal/cmd/build env: WORKFLOW_CACHE_SIZE: "0" TEMPORAL_COVERAGE_FILE: ${{ matrix.uploadCoverage && 'integ_test_zero_cache_cover.out' || '' }} - name: Integration tests (with cache) - run: go run . integration-test -dev-server -junitfile junit-xml/${{matrix.os}}-${{matrix.go-version}}-cache + run: go run . integration-test -dev-server -junit-file-stem ${{matrix.os}}-${{matrix.go-version}}-cache working-directory: ./internal/cmd/build env: TEMPORAL_COVERAGE_FILE: ${{ matrix.uploadCoverage && 'integ_test_normal_cache_cover.out' || '' }} @@ -78,7 +75,7 @@ jobs: if: always() with: name: junit-xml--${{github.run_id}}--${{github.run_attempt}}--${{matrix.os}}-${{matrix.go-version}} - path: junit-xml + path: .build/junit-xml retention-days: 14 - name: Docker compose - checkout diff --git a/internal/cmd/build/main.go b/internal/cmd/build/main.go index 2048af229..166297a90 100644 --- a/internal/cmd/build/main.go +++ b/internal/cmd/build/main.go @@ -54,6 +54,7 @@ func main() { } const coverageDir = ".build/coverage" +const junitDir = ".build/junit-xml" type builder struct { thisDir string @@ -117,7 +118,7 @@ func (b *builder) integrationTest() error { runFlag := flagSet.String("run", "", "Passed to go test as -run") devServerFlag := flagSet.Bool("dev-server", false, "Use an embedded dev server") coverageFileFlag := flagSet.String("coverage-file", "", "If set, enables coverage output to this filename") - junitFileFlag := flagSet.String("junitfile", "junit-xml", "If set, a path prefix to which junit-style xml files should be written") + junitFileStem := flagSet.String("junit-file-stem", "", "If set, an identifier to be used to construct junit xml output file names") if err := flagSet.Parse(os.Args[2:]); err != nil { return fmt.Errorf("failed parsing flags: %w", err) } @@ -138,6 +139,13 @@ func (b *builder) integrationTest() error { } } + // Create junit XML output dir if junit XML output requested + if *junitFileStem != "" { + if err := os.MkdirAll(filepath.Join(b.rootDir, junitDir), 0777); err != nil { + return fmt.Errorf("failed creating junit xml dir: %w", err) + } + } + // Start dev server if wanted if *devServerFlag { devServer, err := testsuite.StartDevServer(context.Background(), testsuite.DevServerOptions{ @@ -178,10 +186,12 @@ func (b *builder) integrationTest() error { // Run integration test args := []string{ gotestsum, - "--junitfile", *junitFileFlag + "-integration-test.xml", - "--", - "-tags", "protolegacy", "-count", "1", "-race", "-v", "-timeout", "10m", } + if *junitFileStem != "" { + args = append(args, "--junitfile", filepath.Join(b.rootDir, junitDir, *junitFileStem+"-integration-test.xml")) + } + args = append(args, "--", "-tags", "protolegacy", "-count", "1", "-race", "-v", "-timeout", "10m") + if *runFlag != "" { args = append(args, "-run", *runFlag) } @@ -244,7 +254,7 @@ func (b *builder) unitTest() error { flagSet := flag.NewFlagSet("unit-test", flag.ContinueOnError) runFlag := flagSet.String("run", "", "Passed to go test as -run") coverageFlag := flagSet.Bool("coverage", false, "If set, enables coverage output") - junitFileFlag := flagSet.String("junitfile", "junit-xml", "If set, a path prefix to which junit-style xml files should be written") + junitFileStem := flagSet.String("junit-file-stem", "", "If set, an identifier to be used to construct junit xml output file names") if err := flagSet.Parse(os.Args[2:]); err != nil { return fmt.Errorf("failed parsing flags: %w", err) } @@ -278,16 +288,24 @@ func (b *builder) unitTest() error { } } + // Create junit XML output dir if junit XML output requested + if *junitFileStem != "" { + if err := os.MkdirAll(filepath.Join(b.rootDir, junitDir), 0777); err != nil { + return fmt.Errorf("failed creating junit xml dir: %w", err) + } + } + // Run unit test for each dir log.Printf("Running unit tests in dirs: %v", testDirs) for _, testDir := range testDirs { // Run unit test args := []string{ gotestsum, - "--junitfile", *junitFileFlag + strings.ReplaceAll(testDir, "/", "-") + "unit-test.xml", - "--", - "-tags", "protolegacy", "-count", "1", "-race", "-v", "-timeout", "15m", } + if *junitFileStem != "" { + args = append(args, "--junitfile", filepath.Join(b.rootDir, junitDir, *junitFileStem+"-"+strings.ReplaceAll(testDir, "/", "-")+"-unit-test.xml")) + } + args = append(args, "--", "-tags", "protolegacy", "-count", "1", "-race", "-v", "-timeout", "15m") if *runFlag != "" { args = append(args, "-run", *runFlag) } From 91e7954b8dbb1c9bc7556f7ca838509ad3b1704f Mon Sep 17 00:00:00 2001 From: Dan Davison Date: Thu, 12 Sep 2024 10:27:38 -0400 Subject: [PATCH 7/9] Dump junit XML for cloud test also --- .github/workflows/ci.yml | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 44b08c39c..b76570bce 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -128,13 +128,29 @@ jobs: - uses: actions/setup-go@v5 with: go-version: ${{ matrix.go-version }} + + - name: Install gotestsum + run: go install gotest.tools/gotestsum@latest + + - name: Create junit-xml directory + run: mkdir junit-xml-cloud + - name: Single integration test against cloud - run: 'go test -v --count 1 -p 1 . -run "TestIntegrationSuite/TestBasic$"' + run: 'gotestsum --junitfile ../junit-xml-cloud/${{matrix.go-version}}-integration.xml -- -v --count 1 -p 1 . -run "TestIntegrationSuite/TestBasic$"' working-directory: test + - name: Cloud operations tests - run: 'go test -v --count 1 -p 1 . -run "TestCloudOperationsSuite/.*" -cloud-operations-tests' + run: 'gotestsum --junitfile ../junit-xml-cloud/${{matrix.go-version}}-cloud-operations.xml -- -v --count 1 -p 1 . -run "TestCloudOperationsSuite/.*" -cloud-operations-tests' working-directory: test + - name: Upload junit-xml artifacts + uses: actions/upload-artifact@v4 + if: always() + with: + name: junit-xml-cloud--${{github.run_id}}--${{github.run_attempt}}--${{matrix.go-version}} + path: junit-xml-cloud + retention-days: 14 + features-test: uses: temporalio/features/.github/workflows/go.yaml@main with: From 6a3d497c335843b97c6ba0e409cea818c31a876b Mon Sep 17 00:00:00 2001 From: Dan Davison Date: Thu, 12 Sep 2024 12:57:05 -0400 Subject: [PATCH 8/9] Delete unnecessary quotes --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b76570bce..aaf57a140 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -70,7 +70,7 @@ jobs: file: coverage.out format: golang - - name: 'Upload junit-xml artifacts' + - name: Upload junit-xml artifacts uses: actions/upload-artifact@v4 if: always() with: From e37808b8e54f073efd363d6f43d8c55630a78088 Mon Sep 17 00:00:00 2001 From: Dan Davison Date: Fri, 13 Sep 2024 23:15:25 -0400 Subject: [PATCH 9/9] Add comment on duplicated hardcoded path --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aaf57a140..7b3021ff5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -75,7 +75,7 @@ jobs: if: always() with: name: junit-xml--${{github.run_id}}--${{github.run_attempt}}--${{matrix.os}}-${{matrix.go-version}} - path: .build/junit-xml + path: .build/junit-xml # This path is also hardcoded in internal/cmd/build/main.go retention-days: 14 - name: Docker compose - checkout