From ec447c3e2c50970702001306d7fee0beff1afd66 Mon Sep 17 00:00:00 2001 From: Wilson Wu Date: Thu, 16 Jun 2022 16:34:17 +0800 Subject: [PATCH 1/6] Fix go 1.18 compatibility issue --- .gitignore | 2 ++ go.mod | 1 + go.sum | 2 ++ 3 files changed, 5 insertions(+) diff --git a/.gitignore b/.gitignore index 543970a..a7b1e24 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +protoc-gen-grpc-gateway-ts +.vscode */node_modules/* */coverage/* dist/* \ No newline at end of file diff --git a/go.mod b/go.mod index 2961624..107a450 100644 --- a/go.mod +++ b/go.mod @@ -16,6 +16,7 @@ require ( github.com/sirupsen/logrus v1.7.0 github.com/stretchr/testify v1.6.1 golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 // indirect + golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c // indirect google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 google.golang.org/grpc v1.33.1 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0 // indirect diff --git a/go.sum b/go.sum index 441b479..5b83e10 100644 --- a/go.sum +++ b/go.sum @@ -92,6 +92,8 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 h1:YyJpGZS1sBuBCzLAR1VEpK193GlqGZbnPFnPV/5Rsb4= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c h1:aFV+BgZ4svzjfabn8ERpuB4JI4N6/rdy1iusx77G3oU= +golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= From 6f23107ea09327213acbee9820c9c79e5dc2f68b Mon Sep 17 00:00:00 2001 From: Wilson Wu Date: Thu, 16 Jun 2022 16:34:17 +0800 Subject: [PATCH 2/6] Fix go 1.18 compatibility issue Signed-off-by: Wilson Wu --- .gitignore | 2 ++ go.mod | 1 + go.sum | 2 ++ 3 files changed, 5 insertions(+) diff --git a/.gitignore b/.gitignore index 543970a..a7b1e24 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +protoc-gen-grpc-gateway-ts +.vscode */node_modules/* */coverage/* dist/* \ No newline at end of file diff --git a/go.mod b/go.mod index 2961624..107a450 100644 --- a/go.mod +++ b/go.mod @@ -16,6 +16,7 @@ require ( github.com/sirupsen/logrus v1.7.0 github.com/stretchr/testify v1.6.1 golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 // indirect + golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c // indirect google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 google.golang.org/grpc v1.33.1 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0 // indirect diff --git a/go.sum b/go.sum index 441b479..5b83e10 100644 --- a/go.sum +++ b/go.sum @@ -92,6 +92,8 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 h1:YyJpGZS1sBuBCzLAR1VEpK193GlqGZbnPFnPV/5Rsb4= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c h1:aFV+BgZ4svzjfabn8ERpuB4JI4N6/rdy1iusx77G3oU= +golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= From e7a968c18993246b0171d7a9feb1a8b81734ba36 Mon Sep 17 00:00:00 2001 From: Wilson Wu Date: Fri, 17 Jun 2022 15:38:50 +0800 Subject: [PATCH 3/6] > try to fix github action problem --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ea8bfd8..d4ca670 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -36,10 +36,10 @@ jobs: uses: arduino/setup-protoc@v1 - name: golangci-lint - uses: golangci/golangci-lint-action@v2 + uses: golangci/golangci-lint-action@v3 with: - # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version. - version: v1.33 + # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version + version: v1.29 # Runs a single command using the runners shell - name: Get go dependencies From d3a3bf2ff58be30ceacb7307b3443a8e88c76b79 Mon Sep 17 00:00:00 2001 From: Wilson Wu Date: Mon, 20 Jun 2022 16:14:01 +0800 Subject: [PATCH 4/6] Upgrade some action uses to v3 --- .github/workflows/main.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d4ca670..bd3d77f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,7 +20,7 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v1 @@ -28,9 +28,9 @@ jobs: node-version: ${{ matrix.node-version }} - name: Set up Go 1.x - uses: actions/setup-go@v2 + uses: actions/setup-go@v3 with: - go-version: ^1.14 + go-version: ^1.17 - name: Install Protoc uses: arduino/setup-protoc@v1 @@ -67,13 +67,13 @@ jobs: needs: [test] steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 0 - name: Set up Go - uses: actions/setup-go@v2 + uses: actions/setup-go@v3 with: - go-version: 1.16 + go-version: 1.17 - name: Run GoReleaser uses: goreleaser/goreleaser-action@v2 if: startsWith(github.ref, 'refs/tags/') From ea0f2d6288238879099b68b0fdc50ab02bc7b542 Mon Sep 17 00:00:00 2001 From: Wilson Wu Date: Mon, 20 Jun 2022 16:18:46 +0800 Subject: [PATCH 5/6] Upgrade lint version to 1.46.x --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bd3d77f..f6a9cf0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -39,7 +39,7 @@ jobs: uses: golangci/golangci-lint-action@v3 with: # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version - version: v1.29 + version: v1.46 # Runs a single command using the runners shell - name: Get go dependencies From bde343ba8a4376eacdfb9199d876f4f759bc7f96 Mon Sep 17 00:00:00 2001 From: Wilson Wu Date: Tue, 21 Jun 2022 11:46:29 +0800 Subject: [PATCH 6/6] Update the go version to 1.18 --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f6a9cf0..1420df8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,7 +30,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v3 with: - go-version: ^1.17 + go-version: ^1.18 - name: Install Protoc uses: arduino/setup-protoc@v1 @@ -73,7 +73,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: 1.17 + go-version: 1.18 - name: Run GoReleaser uses: goreleaser/goreleaser-action@v2 if: startsWith(github.ref, 'refs/tags/')