Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(docs): Bump to v1.7.7 #2952

Merged
merged 15 commits into from
Nov 24, 2021
Merged

chore(docs): Bump to v1.7.7 #2952

merged 15 commits into from
Nov 24, 2021

Conversation

Bisstocuz
Copy link
Contributor

@Bisstocuz Bisstocuz commented Nov 22, 2021

This is an optional solution for v1.7.5 released mistakenly. I think skip v1.7.5 is the best solution.

See: #2951 (comment)

@thinkerou
As your approval, you can create a new release refer to the list, and merge this PR then put this commit into the new release.

@codecov
Copy link

codecov bot commented Nov 22, 2021

Codecov Report

Merging #2952 (d0a4950) into master (57ede9c) will decrease coverage by 0.16%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2952      +/-   ##
==========================================
- Coverage   98.73%   98.57%   -0.17%     
==========================================
  Files          41       41              
  Lines        3080     3080              
==========================================
- Hits         3041     3036       -5     
- Misses         27       31       +4     
- Partials       12       13       +1     
Flag Coverage Δ
go-1.13 ∅ <ø> (∅)
go-1.14 ∅ <ø> (∅)
go-1.15 ∅ <ø> (∅)
go-1.16 98.57% <ø> (ø)
go-1.17 98.47% <ø> (ø)
macos-latest 98.57% <ø> (-0.17%) ⬇️
nomsgpack 98.55% <ø> (-0.17%) ⬇️
ubuntu-latest 98.57% <ø> (-0.17%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
debug.go 91.66% <0.00%> (-8.34%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 57ede9c...d0a4950. Read the comment docs.

@thinkerou
Copy link
Member

https://github.com/gin-gonic/gin/commits/release_176
run make test on my mac:

=== RUN   TestTreeRunDynamicRouting
2021/11/23 11:21:18 http: panic serving 127.0.0.1:59863: runtime error: slice bounds out of range [:8] with capacity 7
goroutine 729 [running]:
net/http.(*conn).serve.func1()
	/usr/local/Cellar/go/1.17/libexec/src/net/http/server.go:1801 +0xb9
panic({0x158bca0, 0xc0002f44b0})
	/usr/local/Cellar/go/1.17/libexec/src/runtime/panic.go:1047 +0x266
github.com/gin-gonic/gin.(*node).getValue(0xc0006be810, {0xc0002ee124, 0x203000}, 0xc00000e1e0, 0xc00000e468, 0x0)
	/Users/tianou/gin/tree.go:431 +0x1345
github.com/gin-gonic/gin.(*Engine).handleHTTPRequest(0xc0001a24e0, 0xc000120200)
	/Users/tianou/gin/gin.go:548 +0x1ee
github.com/gin-gonic/gin.(*Engine).ServeHTTP(0xc0001a24e0, {0x168f730, 0xc00033cb60}, 0xc000121500)
	/Users/tianou/gin/gin.go:511 +0x1d6
net/http.serverHandler.ServeHTTP({0xc0006be720}, {0x168f730, 0xc00033cb60}, 0xc000121500)
	/usr/local/Cellar/go/1.17/libexec/src/net/http/server.go:2878 +0x43b
net/http.(*conn).serve(0xc000543040, {0x1694360, 0xc00074a060})
	/usr/local/Cellar/go/1.17/libexec/src/net/http/server.go:1929 +0xb08
created by net/http.(*Server).Serve
	/usr/local/Cellar/go/1.17/libexec/src/net/http/server.go:3033 +0x4e8
    gin_integration_test.go:42:
        	Error Trace:	gin_integration_test.go:42
        	            				gin_integration_test.go:491
        	Error:      	Received unexpected error:
        	            	Get "http://127.0.0.1:59819/something/abcdad/thirdthing": EOF
        	Test:       	TestTreeRunDynamicRouting
--- FAIL: TestTreeRunDynamicRouting (0.01s)
panic: runtime error: invalid memory address or nil pointer dereference [recovered]
	panic: runtime error: invalid memory address or nil pointer dereference
[signal SIGSEGV: segmentation violation code=0x1 addr=0x40 pc=0x14abebf]

goroutine 498 [running]:
testing.tRunner.func1.2({0x153d800, 0x19ff090})
	/usr/local/Cellar/go/1.17/libexec/src/testing/testing.go:1209 +0x24e
testing.tRunner.func1()
	/usr/local/Cellar/go/1.17/libexec/src/testing/testing.go:1212 +0x218
panic({0x153d800, 0x19ff090})
	/usr/local/Cellar/go/1.17/libexec/src/runtime/panic.go:1038 +0x215
github.com/gin-gonic/gin.testRequest(0xc0001a2340, {0xc000363f28, 0x3, 0x15ca61d})
	/Users/tianou/gin/gin_integration_test.go:43 +0x17f
github.com/gin-gonic/gin.TestTreeRunDynamicRouting(0xc0005d4d00)
	/Users/tianou/gin/gin_integration_test.go:491 +0x2573
testing.tRunner(0xc0001a2340, 0x15e9b10)
	/usr/local/Cellar/go/1.17/libexec/src/testing/testing.go:1259 +0x102
created by testing.(*T).Run
	/usr/local/Cellar/go/1.17/libexec/src/testing/testing.go:1306 +0x35a
FAIL	github.com/gin-gonic/gin	0.730s
FAIL
make: *** [test] Error 1

@Bisstocuz
Copy link
Contributor Author

Bisstocuz commented Nov 23, 2021

https://github.com/gin-gonic/gin/commits/release_176 run make test on my mac:

=== RUN   TestTreeRunDynamicRouting
2021/11/23 11:21:18 http: panic serving 127.0.0.1:59863: runtime error: slice bounds out of range [:8] with capacity 7
goroutine 729 [running]:
net/http.(*conn).serve.func1()
	/usr/local/Cellar/go/1.17/libexec/src/net/http/server.go:1801 +0xb9
panic({0x158bca0, 0xc0002f44b0})
	/usr/local/Cellar/go/1.17/libexec/src/runtime/panic.go:1047 +0x266
github.com/gin-gonic/gin.(*node).getValue(0xc0006be810, {0xc0002ee124, 0x203000}, 0xc00000e1e0, 0xc00000e468, 0x0)
	/Users/tianou/gin/tree.go:431 +0x1345
github.com/gin-gonic/gin.(*Engine).handleHTTPRequest(0xc0001a24e0, 0xc000120200)
	/Users/tianou/gin/gin.go:548 +0x1ee
github.com/gin-gonic/gin.(*Engine).ServeHTTP(0xc0001a24e0, {0x168f730, 0xc00033cb60}, 0xc000121500)
	/Users/tianou/gin/gin.go:511 +0x1d6
net/http.serverHandler.ServeHTTP({0xc0006be720}, {0x168f730, 0xc00033cb60}, 0xc000121500)
	/usr/local/Cellar/go/1.17/libexec/src/net/http/server.go:2878 +0x43b
net/http.(*conn).serve(0xc000543040, {0x1694360, 0xc00074a060})
	/usr/local/Cellar/go/1.17/libexec/src/net/http/server.go:1929 +0xb08
created by net/http.(*Server).Serve
	/usr/local/Cellar/go/1.17/libexec/src/net/http/server.go:3033 +0x4e8
    gin_integration_test.go:42:
        	Error Trace:	gin_integration_test.go:42
        	            				gin_integration_test.go:491
        	Error:      	Received unexpected error:
        	            	Get "http://127.0.0.1:59819/something/abcdad/thirdthing": EOF
        	Test:       	TestTreeRunDynamicRouting
--- FAIL: TestTreeRunDynamicRouting (0.01s)
panic: runtime error: invalid memory address or nil pointer dereference [recovered]
	panic: runtime error: invalid memory address or nil pointer dereference
[signal SIGSEGV: segmentation violation code=0x1 addr=0x40 pc=0x14abebf]

goroutine 498 [running]:
testing.tRunner.func1.2({0x153d800, 0x19ff090})
	/usr/local/Cellar/go/1.17/libexec/src/testing/testing.go:1209 +0x24e
testing.tRunner.func1()
	/usr/local/Cellar/go/1.17/libexec/src/testing/testing.go:1212 +0x218
panic({0x153d800, 0x19ff090})
	/usr/local/Cellar/go/1.17/libexec/src/runtime/panic.go:1038 +0x215
github.com/gin-gonic/gin.testRequest(0xc0001a2340, {0xc000363f28, 0x3, 0x15ca61d})
	/Users/tianou/gin/gin_integration_test.go:43 +0x17f
github.com/gin-gonic/gin.TestTreeRunDynamicRouting(0xc0005d4d00)
	/Users/tianou/gin/gin_integration_test.go:491 +0x2573
testing.tRunner(0xc0001a2340, 0x15e9b10)
	/usr/local/Cellar/go/1.17/libexec/src/testing/testing.go:1259 +0x102
created by testing.(*T).Run
	/usr/local/Cellar/go/1.17/libexec/src/testing/testing.go:1306 +0x35a
FAIL	github.com/gin-gonic/gin	0.730s
FAIL
make: *** [test] Error 1

env: go version go1.17.3 linux/amd64
@thinkerou
I tested your branch and I got the same error, but I got PASS on my https://github.com/Bisstocuz/gin/commits/v1.7.6:

# go test
go: downloading github.com/ugorji/go v1.1.7
go: downloading golang.org/x/sys v0.0.0-20200116001909-b77594299b42
go: downloading github.com/davecgh/go-spew v1.1.1
go: downloading github.com/pmezard/go-difflib v1.0.0
go: downloading github.com/go-playground/universal-translator v0.17.0
go: downloading github.com/leodido/go-urn v1.2.0
go: downloading golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
go: downloading github.com/go-playground/locales v0.13.0
2021/11/23 11:56:44 The AppEngine flag is going to be deprecated. Please check issues #2723 and #2739 and use 'TrustedPlatform: gin.PlatformGoogleAppEngine' instead.
[GIN] 2021/11/23 - 11:56:44 | 200 |        6.23µs |       192.0.2.1 | GET      "/name1/api"
[GIN] 2021/11/23 - 11:56:44 | 200 |       1.312µs |       192.0.2.1 | GET      "/name2/api"
[GIN] 2021/11/23 - 11:56:44 | 200 |      10.143µs |       192.0.2.1 | GET      "/test/copy/race"
PASS
ok  	github.com/gin-gonic/gin	0.237s

I will check out it later today for finding details we ignored.
Did you try to create new branch from tag v1.7.4?

@thinkerou
Copy link
Member

thinkerou commented Nov 23, 2021

Released v1.7.6 using the code of v1.7.4 version to fix the error at first, please see https://github.com/gin-gonic/gin/releases/tag/v1.7.6, thanks!

@Bisstocuz
Copy link
Contributor Author

Released v1.7.6 using the code of v1.7.4 version to fix the error at first, please see https://github.com/gin-gonic/gin/releases/tag/v1.7.6, thanks!

Hi, there! What I mean is that create a new branch from tag v1.7.4, and cherry-pick those necessary commits then put them into the new branch based on v1.7.4.

I found the errors you reported occurred with data added in #2767.

@thinkerou
Copy link
Member

Hi, there! What I mean is that create a new branch from tag v1.7.4, and cherry-pick those necessary commits then put them into the new branch based on v1.7.4.

@Bisstocuz when I created v1.7.5 based on v1.7.4 and use cherry-pick, but have some error, I don't fix it, oh no...it's released.

@Bisstocuz
Copy link
Contributor Author

Bisstocuz commented Nov 23, 2021

Hi, there! What I mean is that create a new branch from tag v1.7.4, and cherry-pick those necessary commits then put them into the new branch based on v1.7.4.

@Bisstocuz when I created v1.7.5 based on v1.7.4 and use cherry-pick, but have some error, I don't fix it, oh no...it's released.

Look at this: https://github.com/Bisstocuz/gin/commits/pre177 (You can run tests with this branch on your Mac, I tested it on my CentOS server.)
I create a new branch from tag v1.7.4 again and cherry-pick commits, it still work normally.
Throughout the whole process, I only need to handle the conflicts on #2828 and #2897.
So, just create a new branch from tag v1.7.4, and follow my order to cherry-pick commits from the bottom to the top.

I believe the error you meet at first has to do with some PRs you missed.

Note: I used JetBrains GoLand's graphics user interface to compare and cherry-pick then handle conflicts.

@Bisstocuz Bisstocuz changed the title chore(docs): Bump to v1.7.6 chore(docs): Bump to v1.7.7 Nov 23, 2021
@thinkerou
Copy link
Member

@Bisstocuz thanks! https://github.com/gin-gonic/gin/tree/v177 ready and wait release

Copy link
Member

@thinkerou thinkerou left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@thinkerou thinkerou merged commit 4d7c4ec into gin-gonic:master Nov 24, 2021
thinkerou pushed a commit that referenced this pull request Nov 24, 2021
* Perfect TrustedProxies feature

* some typo fix

* fix some typo

* bump to v1.7.6

* remove 'retract'

* Revert "remove 'retract'"

This reverts commit 3fc2ab4.

* Update CHANGELOG.md

* Bump to v1.7.7 preparations
@Bisstocuz Bisstocuz deleted the bump-v1.7.6 branch November 24, 2021 14:18
daheige pushed a commit to daheige/gin that referenced this pull request Apr 18, 2022
* Perfect TrustedProxies feature

* some typo fix

* fix some typo

* bump to v1.7.6

* remove 'retract'

* Revert "remove 'retract'"

This reverts commit 3fc2ab4.

* Update CHANGELOG.md

* Bump to v1.7.7 preparations
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants