mirror of
https://github.com/v2fly/v2ray-core.git
synced 2025-01-02 23:47:07 -05:00
Merge branch 'master' of github.com:v2fly/v2ray-core
# Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.
This commit is contained in:
commit
9e62f4a934
@ -198,7 +198,7 @@ func (c *udpConn) RemoteAddr() net.Addr {
|
||||
}
|
||||
|
||||
func (c *udpConn) LocalAddr() net.Addr {
|
||||
return c.remote
|
||||
return c.local
|
||||
}
|
||||
|
||||
func (*udpConn) SetDeadline(time.Time) error {
|
||||
|
@ -9,7 +9,7 @@ jobs:
|
||||
- checkout: self
|
||||
- task: GoTool@0
|
||||
inputs:
|
||||
version: '1.13'
|
||||
version: '1.14'
|
||||
- script: |
|
||||
go test -p 1 -v -timeout 30m ./...
|
||||
workingDirectory: '$(Build.SourcesDirectory)'
|
||||
|
@ -42,7 +42,7 @@ jobs:
|
||||
- checkout: self
|
||||
- task: GoTool@0
|
||||
inputs:
|
||||
version: '1.14.1'
|
||||
version: '1.14.4'
|
||||
- script: |
|
||||
bash ./testing/coverage/coverall
|
||||
workingDirectory: '$(Build.SourcesDirectory)'
|
||||
@ -66,7 +66,7 @@ jobs:
|
||||
- checkout: self
|
||||
- task: GoTool@0
|
||||
inputs:
|
||||
version: '1.14.1'
|
||||
version: '1.14.4'
|
||||
- script: |
|
||||
mkdir triggersrc
|
||||
ls -I "triggersrc" | xargs cp -rf -t triggersrc
|
||||
|
Loading…
Reference in New Issue
Block a user