zishuo/webrtc
1
0
Fork 0
mirror of https://github.com/pion/webrtc.git synced 2025-10-05 23:26:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Golang1.13 updates

Browse Source 
Update travis to work with golang1.13 + update wasm code
This commit is contained in:
Hugo Arregui
2019-09-07 13:50:55 -03:00
committed by Sean DuBois
parent 59f78adf84
commit 06733a856b
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@@ -12,7 +12,7 @@ services:
install: install:
# Manually download and install Go 1.12 instead of using gimme. # Manually download and install Go 1.12 instead of using gimme.
# It looks like gimme Go causes some errors on go-test for Wasm. # It looks like gimme Go causes some errors on go-test for Wasm.
- wget -O go.tar.gz https://dl.google.com/go/go1.12.linux-amd64.tar.gz - wget -O go.tar.gz https://dl.google.com/go/go1.13.linux-amd64.tar.gz
- tar -C ~ -xzf go.tar.gz - tar -C ~ -xzf go.tar.gz
- rm go.tar.gz - rm go.tar.gz
- export GOROOT=~/go - export GOROOT=~/go
@@ -20,7 +20,7 @@ install:
- go version - go version
- go env - go env
- go get -u github.com/matoous/godox - go get -u github.com/matoous/godox
- curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b $GOPATH/bin v1.17.1 - GO111MODULE=off go get -u github.com/golangci/golangci-lint/cmd/golangci-lint
# Install Node 11 (required for WASM tests) # Install Node 11 (required for WASM tests)
- wget https://raw.githubusercontent.com/creationix/nvm/v0.31.0/nvm.sh -O ~/.nvm/nvm.sh - wget https://raw.githubusercontent.com/creationix/nvm/v0.31.0/nvm.sh -O ~/.nvm/nvm.sh
- source ~/.nvm/nvm.sh - source ~/.nvm/nvm.sh
@@ -42,4 +42,4 @@ script:
- go test -tags quic -coverpkg=$(go list ./... | grep -v examples | tr '\n' ',') -coverprofile=cover.out -v -race -covermode=atomic ./... - go test -tags quic -coverpkg=$(go list ./... | grep -v examples | tr '\n' ',') -coverprofile=cover.out -v -race -covermode=atomic ./...
- GOOS=js GOARCH=wasm go test -exec="./test-wasm/go_js_wasm_exec" -v . - GOOS=js GOARCH=wasm go test -exec="./test-wasm/go_js_wasm_exec" -v .
- bash <(curl -s https://codecov.io/bash) - bash <(curl -s https://codecov.io/bash)
- docker run -e "GO111MODULE=on" -v $PWD:/go/src/github.com/pion/webrtc -w /go/src/github.com/pion/webrtc -it i386/golang:1.12-buster '/usr/local/go/bin/go' 'test' '-tags' 'quic' "-coverpkg=$(go list ./... | grep -v examples | tr '\n' ',')" '-v' './...' - docker run -e "GO111MODULE=on" -v $PWD:/go/src/github.com/pion/webrtc -w /go/src/github.com/pion/webrtc -it i386/golang:1.13-buster '/usr/local/go/bin/go' 'test' '-tags' 'quic' "-coverpkg=$(go list ./... | grep -v examples | tr '\n' ',')" '-v' './...'

6
datachannel_js.go
View File

@@ -89,9 +89,9 @@ func (d *DataChannel) Send(data []byte) (err error) {
err = recoveryToError(e) err = recoveryToError(e)
} }
}() }()
array := js.TypedArrayOf([]uint8(data)) array := js.Global().Get("Uint8Array").New(len(data))
defer array.Release() js.CopyBytesToJS(array, data)
d.underlying.Call("send", array.Value) d.underlying.Call("send", array)
return nil return nil
} }

4
js_utils.go
View File

@@ -162,7 +162,7 @@ func recoveryToError(e interface{}) error {
func uint8ArrayValueToBytes(val js.Value) []byte { func uint8ArrayValueToBytes(val js.Value) []byte {
result := make([]byte, val.Length()) result := make([]byte, val.Length())
jsResult := js.TypedArrayOf(result) js.CopyBytesToGo(result, val)
jsResult.Call("set", val)
return result return result
} }