From 0062453762b753e6b76c9d40e3e8759a4c874538 Mon Sep 17 00:00:00 2001 From: Tiago Peczenyj Date: Tue, 10 May 2022 11:45:11 +0200 Subject: [PATCH 1/7] enable tests with latest versions of go --- .github/workflows/test.yaml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 21419bd9..067ac375 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -10,12 +10,15 @@ on: jobs: go-client: runs-on: ubuntu-latest + strategy: + matrix: + goVer: [1.13 1.17 1.18] steps: - uses: actions/checkout@v2 - - name: Setup go + - name: Setup go ${{ matrix.goVer }} uses: actions/setup-go@v1 with: - go-version: '1.13' + go-version: ${{ matrix.goVer }} - name: Test with GO test run: | make up @@ -29,10 +32,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Setup go + - name: Setup go ${{ matrix.goVer }} uses: actions/setup-go@v1 with: - go-version: '1.13' + go-version: ${{ matrix.goVer }} - name: Test SSL connection with CA run: | make up-ssl @@ -51,10 +54,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Setup go + - name: Setup go ${{ matrix.goVer }} uses: actions/setup-go@v1 with: - go-version: '1.13' + go-version: ${{ matrix.goVer }} - name: Run examples run: | make up From 832346bd7bdf88649857c210850f6d013cc01920 Mon Sep 17 00:00:00 2001 From: Tiago Peczenyj Date: Tue, 10 May 2022 11:48:23 +0200 Subject: [PATCH 2/7] fix workflow --- .github/workflows/test.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 067ac375..c4ae50c2 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -30,6 +30,9 @@ jobs: make down go-client-ssl: runs-on: ubuntu-latest + strategy: + matrix: + goVer: [1.13 1.17 1.18] steps: - uses: actions/checkout@v2 - name: Setup go ${{ matrix.goVer }} @@ -52,6 +55,9 @@ jobs: make down go-client-example: runs-on: ubuntu-latest + strategy: + matrix: + goVer: [1.13 1.17 1.18] steps: - uses: actions/checkout@v2 - name: Setup go ${{ matrix.goVer }} From 914be162fdb7d3f8782db29cdf47b06c5fab394f Mon Sep 17 00:00:00 2001 From: Tiago Peczenyj Date: Tue, 10 May 2022 11:52:13 +0200 Subject: [PATCH 3/7] fix workflow go version format --- .github/workflows/test.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index c4ae50c2..c79d88af 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - goVer: [1.13 1.17 1.18] + goVer: ['1.13', '1.17', '1.18'] steps: - uses: actions/checkout@v2 - name: Setup go ${{ matrix.goVer }} @@ -32,7 +32,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - goVer: [1.13 1.17 1.18] + goVer: ['1.13', '1.17', '1.18'] steps: - uses: actions/checkout@v2 - name: Setup go ${{ matrix.goVer }} @@ -57,7 +57,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - goVer: [1.13 1.17 1.18] + goVer: ['1.13', '1.17', '1.18'] steps: - uses: actions/checkout@v2 - name: Setup go ${{ matrix.goVer }} From 98d675249d2189755da72e4f1a63a2bea8ab1df1 Mon Sep 17 00:00:00 2001 From: Tiago Peczenyj Date: Tue, 10 May 2022 12:00:46 +0200 Subject: [PATCH 4/7] update go.mod with latest go version available --- go.mod | 12 +++++++++--- go.sum | 8 ++++---- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index d858ca15..0a80a189 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,14 @@ module github.com/vesoft-inc/nebula-go/v3 -go 1.13 +go 1.18 require ( - github.com/facebook/fbthrift v0.31.1-0.20211129061412-801ed7f9f295 - github.com/stretchr/testify v1.7.0 + github.com/facebook/fbthrift v0.31.0 + github.com/stretchr/testify v1.7.1 +) + +require ( + github.com/davecgh/go-spew v1.1.0 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect ) diff --git a/go.sum b/go.sum index e449129e..928174d1 100644 --- a/go.sum +++ b/go.sum @@ -1,12 +1,12 @@ github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/facebook/fbthrift v0.31.1-0.20211129061412-801ed7f9f295 h1:ZA+qQ3d2In0RNzVpk+D/nq1sjDSv+s1Wy2zrAPQAmsg= -github.com/facebook/fbthrift v0.31.1-0.20211129061412-801ed7f9f295/go.mod h1:2tncLx5rmw69e5kMBv/yJneERbzrr1yr5fdlnTbu8lU= +github.com/facebook/fbthrift v0.31.0 h1:vVZbmPbaHuC58HCKgsYgj8GKe89nC4dPmFI/8kKNXDE= +github.com/facebook/fbthrift v0.31.0/go.mod h1:2tncLx5rmw69e5kMBv/yJneERbzrr1yr5fdlnTbu8lU= 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/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= From 2bff3ae33743fe46023b5d8d5e0e49537ed38314 Mon Sep 17 00:00:00 2001 From: Tiago Peczenyj Date: Tue, 10 May 2022 12:03:19 +0200 Subject: [PATCH 5/7] Revert "update go.mod with latest go version available" This reverts commit 98d675249d2189755da72e4f1a63a2bea8ab1df1. --- go.mod | 12 +++--------- go.sum | 8 ++++---- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/go.mod b/go.mod index 0a80a189..d858ca15 100644 --- a/go.mod +++ b/go.mod @@ -1,14 +1,8 @@ module github.com/vesoft-inc/nebula-go/v3 -go 1.18 +go 1.13 require ( - github.com/facebook/fbthrift v0.31.0 - github.com/stretchr/testify v1.7.1 -) - -require ( - github.com/davecgh/go-spew v1.1.0 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect - gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect + github.com/facebook/fbthrift v0.31.1-0.20211129061412-801ed7f9f295 + github.com/stretchr/testify v1.7.0 ) diff --git a/go.sum b/go.sum index 928174d1..e449129e 100644 --- a/go.sum +++ b/go.sum @@ -1,12 +1,12 @@ github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/facebook/fbthrift v0.31.0 h1:vVZbmPbaHuC58HCKgsYgj8GKe89nC4dPmFI/8kKNXDE= -github.com/facebook/fbthrift v0.31.0/go.mod h1:2tncLx5rmw69e5kMBv/yJneERbzrr1yr5fdlnTbu8lU= +github.com/facebook/fbthrift v0.31.1-0.20211129061412-801ed7f9f295 h1:ZA+qQ3d2In0RNzVpk+D/nq1sjDSv+s1Wy2zrAPQAmsg= +github.com/facebook/fbthrift v0.31.1-0.20211129061412-801ed7f9f295/go.mod h1:2tncLx5rmw69e5kMBv/yJneERbzrr1yr5fdlnTbu8lU= 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/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= From 1aa23e0eed694f6fa9aedb3619b3670f1399ea29 Mon Sep 17 00:00:00 2001 From: Tiago Peczenyj Date: Tue, 10 May 2022 12:05:09 +0200 Subject: [PATCH 6/7] update go.mod and go.sum using go1.13 --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index d858ca15..7122d0da 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,6 @@ module github.com/vesoft-inc/nebula-go/v3 go 1.13 require ( - github.com/facebook/fbthrift v0.31.1-0.20211129061412-801ed7f9f295 - github.com/stretchr/testify v1.7.0 + github.com/facebook/fbthrift v0.31.0 + github.com/stretchr/testify v1.7.1 ) diff --git a/go.sum b/go.sum index e449129e..928174d1 100644 --- a/go.sum +++ b/go.sum @@ -1,12 +1,12 @@ github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/facebook/fbthrift v0.31.1-0.20211129061412-801ed7f9f295 h1:ZA+qQ3d2In0RNzVpk+D/nq1sjDSv+s1Wy2zrAPQAmsg= -github.com/facebook/fbthrift v0.31.1-0.20211129061412-801ed7f9f295/go.mod h1:2tncLx5rmw69e5kMBv/yJneERbzrr1yr5fdlnTbu8lU= +github.com/facebook/fbthrift v0.31.0 h1:vVZbmPbaHuC58HCKgsYgj8GKe89nC4dPmFI/8kKNXDE= +github.com/facebook/fbthrift v0.31.0/go.mod h1:2tncLx5rmw69e5kMBv/yJneERbzrr1yr5fdlnTbu8lU= 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/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= From 90f3686e6300260633425ba93684c457fb18b773 Mon Sep 17 00:00:00 2001 From: Tiago Peczenyj Date: Wed, 11 May 2022 07:54:34 +0200 Subject: [PATCH 7/7] Revert "update go.mod and go.sum using go1.13" This reverts commit 1aa23e0eed694f6fa9aedb3619b3670f1399ea29. --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 7122d0da..d858ca15 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,6 @@ module github.com/vesoft-inc/nebula-go/v3 go 1.13 require ( - github.com/facebook/fbthrift v0.31.0 - github.com/stretchr/testify v1.7.1 + github.com/facebook/fbthrift v0.31.1-0.20211129061412-801ed7f9f295 + github.com/stretchr/testify v1.7.0 ) diff --git a/go.sum b/go.sum index 928174d1..e449129e 100644 --- a/go.sum +++ b/go.sum @@ -1,12 +1,12 @@ github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/facebook/fbthrift v0.31.0 h1:vVZbmPbaHuC58HCKgsYgj8GKe89nC4dPmFI/8kKNXDE= -github.com/facebook/fbthrift v0.31.0/go.mod h1:2tncLx5rmw69e5kMBv/yJneERbzrr1yr5fdlnTbu8lU= +github.com/facebook/fbthrift v0.31.1-0.20211129061412-801ed7f9f295 h1:ZA+qQ3d2In0RNzVpk+D/nq1sjDSv+s1Wy2zrAPQAmsg= +github.com/facebook/fbthrift v0.31.1-0.20211129061412-801ed7f9f295/go.mod h1:2tncLx5rmw69e5kMBv/yJneERbzrr1yr5fdlnTbu8lU= 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/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=