diff --git a/.github/dependabot.yml b/.github/dependabot.yml index e9ad69a..f04ebf9 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,6 +1,16 @@ version: 2 updates: -- package-ecosystem: gomod - directory: "/" - schedule: - interval: weekly + - package-ecosystem: gomod + directory: "/" + schedule: + interval: weekly + allow: + - dependency-type: all + groups: + go: + patterns: + - "*" + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: weekly \ No newline at end of file diff --git a/.github/workflows/release-on-pr-merge.yml b/.github/workflows/release-on-pr-merge.yml index 9580675..77aa659 100644 --- a/.github/workflows/release-on-pr-merge.yml +++ b/.github/workflows/release-on-pr-merge.yml @@ -10,10 +10,10 @@ jobs: GITHUB_TOKEN: '${{ secrets.GAUGEBOT_GITHUB_TOKEN }}' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version-file: 'go.mod' @@ -29,24 +29,18 @@ jobs: - name: Deploy run: | - cd deploy if [ -z "$version" ]; then - version=$(ls xml-report* | head -1 | sed "s/\.[^\.]*$//" | sed "s/xml-report-//" | sed "s/-[a-z]*\.[a-z0-9_]*$//"); + version=$(cd deploy && ls xml-report* | head -1 | sed "s/\.[^\.]*$//" | sed "s/xml-report-//" | sed "s/-[a-z]*\.[a-z0-9_]*$//"); fi echo "VERSION=$version" >> $GITHUB_ENV - artifacts=() - dir=`pwd` - for i in `ls`; do - artifacts+="$dir/$i " - done - cd .. + echo "---------------------------" echo "Updating release v$version" echo "---------------------------" - echo -e "XML Report v$version\n\n" > desc.txt + echo -e "Gauge XML Report v$version\n\n" > desc.txt release_description=$(ruby -e "$(curl -sSfL https://github.com/getgauge/gauge/raw/master/build/create_release_text.rb)" getgauge xml-report) echo "$release_description" >> desc.txt - gh release create "v$version" -F ./desc.txt $artifacts + gh release create --title "Gauge XML Report v${version}" --notes-file ./desc.txt "v${version}" deploy/* - name: Update metadata in gauge-repository run: | diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ca2e94c..df2e621 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -16,10 +16,10 @@ jobs: steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version-file: 'go.mod' diff --git a/build/make.go b/build/make.go index 41553c5..8d11510 100644 --- a/build/make.go +++ b/build/make.go @@ -10,7 +10,6 @@ import ( "flag" "fmt" "io" - "io/ioutil" "log" "os" "os/exec" @@ -283,7 +282,7 @@ var ( ) func getPluginProperties(jsonPropertiesFile string) (map[string]interface{}, error) { - pluginPropertiesJson, err := ioutil.ReadFile(jsonPropertiesFile) + pluginPropertiesJson, err := os.ReadFile(jsonPropertiesFile) if err != nil { fmt.Printf("Could not read %s: %s\n", filepath.Base(jsonPropertiesFile), err.Error()) return nil, err diff --git a/builder/integration_test.go b/builder/integration_test.go index cb3f22c..ad9fa72 100644 --- a/builder/integration_test.go +++ b/builder/integration_test.go @@ -11,10 +11,9 @@ package builder import ( "encoding/xml" + "os" "path/filepath" - "io/ioutil" - "strings" "github.com/getgauge/gauge-proto/go/gauge_messages" @@ -26,7 +25,7 @@ import ( var junitSchema *xsd.Schema func init() { - schema, err := ioutil.ReadFile(filepath.Join("_testdata", "junit.xsd")) + schema, err := os.ReadFile(filepath.Join("_testdata", "junit.xsd")) if err != nil { panic(err) } diff --git a/go.mod b/go.mod index 717042b..5436c79 100644 --- a/go.mod +++ b/go.mod @@ -1,25 +1,25 @@ module github.com/getgauge/xml-report -go 1.21 +go 1.22 require ( - github.com/getgauge/common v0.0.0-20231211152919-94c93e29f0b9 - github.com/getgauge/gauge-proto/go/gauge_messages v0.0.0-20240122132601-bb92eb77d703 - github.com/lestrrat-go/libxml2 v0.0.0-20231124114421-99c71026c2f5 + github.com/getgauge/common v0.0.0-20240331100109-225c78ec8f30 + github.com/getgauge/gauge-proto/go/gauge_messages v0.0.0-20240331094732-ac276d4db3b9 + github.com/lestrrat-go/libxml2 v0.0.0-20240328005548-52975fd1a01c google.golang.org/grpc v1.62.1 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c ) require ( github.com/dmotylev/goproperties v0.0.0-20140630191356-7cbffbaada47 // indirect - github.com/golang/protobuf v1.5.3 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/kr/pretty v0.3.1 // indirect github.com/kr/text v0.2.0 // indirect github.com/pkg/errors v0.9.1 // indirect - github.com/rogpeppe/go-internal v1.11.0 // indirect - golang.org/x/net v0.20.0 // indirect - golang.org/x/sys v0.16.0 // indirect + github.com/rogpeppe/go-internal v1.12.0 // indirect + golang.org/x/net v0.22.0 // indirect + golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/protobuf v1.32.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect + google.golang.org/protobuf v1.33.0 // indirect ) diff --git a/go.sum b/go.sum index 39ac936..7a2d40c 100644 --- a/go.sum +++ b/go.sum @@ -3,14 +3,12 @@ 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/dmotylev/goproperties v0.0.0-20140630191356-7cbffbaada47 h1:sP2APvSdZpfBiousrppBZNOvu+TE79Myq4kkmmrtSuI= github.com/dmotylev/goproperties v0.0.0-20140630191356-7cbffbaada47/go.mod h1:f2V6964+f0p8Asqy8mIK5cKyyVc6MP9PFzGVNRcnYJQ= -github.com/getgauge/common v0.0.0-20231211152919-94c93e29f0b9 h1:OwggKdL8AeteB2y0xJzloieq9CMhYG7YmKKMh6D8FLs= -github.com/getgauge/common v0.0.0-20231211152919-94c93e29f0b9/go.mod h1:p/Q0+qO2bLq08PuxaHrxIgkvKlGGYHyXad33+zKIiXU= -github.com/getgauge/gauge-proto/go/gauge_messages v0.0.0-20240122132601-bb92eb77d703 h1:ZFK55KGnHAFpwk4YbQsp8r1ybf76MQcEVba5V21qB7w= -github.com/getgauge/gauge-proto/go/gauge_messages v0.0.0-20240122132601-bb92eb77d703/go.mod h1:grwwUhEUaDZHOj11RDIk5w7tciDv3fYDXeyYoL2BgGc= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/getgauge/common v0.0.0-20240331100109-225c78ec8f30 h1:pGrxY3IZb/1wwlSUSKYplmQ9kEh4rRpcAvQYI2WcxX0= +github.com/getgauge/common v0.0.0-20240331100109-225c78ec8f30/go.mod h1:q7UW1tDojJwCQPUHaE1ny71IZIDuKlsgh3Tyr5wAZDk= +github.com/getgauge/gauge-proto/go/gauge_messages v0.0.0-20240331094732-ac276d4db3b9 h1:g3Qhoj4ho3txgMcOJ3ivvEhfahaR6t8XTkf5K5M1VSA= +github.com/getgauge/gauge-proto/go/gauge_messages v0.0.0-20240331094732-ac276d4db3b9/go.mod h1:ZOT57PjvIqY31eGcwhj/LSi/K6ULBE1AhFcIMzWkmPg= +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.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= @@ -20,33 +18,30 @@ 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/lestrrat-go/libxml2 v0.0.0-20231124114421-99c71026c2f5 h1:lR4DHv41vdkhNPNDlr56n8BuLINQeWNeQAaAzBEOcuw= -github.com/lestrrat-go/libxml2 v0.0.0-20231124114421-99c71026c2f5/go.mod h1:/0MMipmS+5SMXCSkulsvJwYmddKI4IL5tVy6AZMo9n0= +github.com/lestrrat-go/libxml2 v0.0.0-20240328005548-52975fd1a01c h1:qeHIHhYpg/6xigBAdJyHi72pT/Di0lmL7Aq1ExbKfmc= +github.com/lestrrat-go/libxml2 v0.0.0-20240328005548-52975fd1a01c/go.mod h1:/0MMipmS+5SMXCSkulsvJwYmddKI4IL5tVy6AZMo9n0= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= -github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= -github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= +github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= +github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= -golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= -golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= +golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda h1:LI5DOvAxUPMv/50agcLLoo+AdWc1irS9Rzz4vPuD1V4= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= -google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/xmlpath.v1 v1.0.0-20140413065638-a146725ea6e7 h1:zibSPXbkfB1Dwl76rJgLa68xcdHu42qmFTe6vAnU4wA= diff --git a/plugin.json b/plugin.json index f88d67d..8cf3896 100644 --- a/plugin.json +++ b/plugin.json @@ -28,5 +28,5 @@ "scope": [ "Execution" ], - "version": "0.5.0" + "version": "0.5.1" } \ No newline at end of file diff --git a/release.sh b/release.sh deleted file mode 100755 index 000c191..0000000 --- a/release.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -if [ -z "$GITHUB_TOKEN" ]; then - echo "GITHUB_TOKEN is not set." - echo "Please create an personal access token with repo:public_repo scopes." - exit 1 -fi - -curl \ - -X POST \ - -H "Authorization: token $GITHUB_TOKEN" \ - -H "Accept: application/vnd.github.ant-man-preview+json" \ - -H "Content-Type: application/json" \ - https://api.github.com/repos/getgauge/xml-report/deployments \ - --data '{"ref": "master", "required_contexts": [], "environment": "production"}' diff --git a/xmlReport.go b/xmlReport.go index 74cfcad..3d404e1 100644 --- a/xmlReport.go +++ b/xmlReport.go @@ -8,7 +8,6 @@ package main import ( "fmt" - "io/ioutil" "os" "path/filepath" "strings" @@ -17,8 +16,8 @@ import ( "github.com/getgauge/xml-report/logger" "github.com/getgauge/common" - "github.com/getgauge/xml-report/builder" "github.com/getgauge/gauge-proto/go/gauge_messages" + "github.com/getgauge/xml-report/builder" ) const ( @@ -50,7 +49,7 @@ func createReport(suiteResult *gauge_messages.SuiteExecutionResult) { func writeResultFile(reportDir string, bytes []byte) error { resultPath := filepath.Join(reportDir, resultFile) - err := ioutil.WriteFile(resultPath, bytes, common.NewFilePermissions) + err := os.WriteFile(resultPath, bytes, common.NewFilePermissions) if err != nil { return fmt.Errorf("failed to copy file: %s %s\n ", resultFile, err) }