diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0f896ef2b142df47ebbb84594e484ee68fa28eb1..37282e1bf14f7be539c422b1029864f21a071219 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,19 +4,19 @@ on: [push] jobs: fmt: runs-on: ubuntu-latest - container: nhooyr/websocket-ci@sha256:54a12b52be98d2d1588a054cfce35d17705c9b45546478d8bcdbac2a89a90001 + container: nhooyr/websocket-ci@sha256:ea94e078d2d589d654a2c759d952bf4199c754d80dadb20696dc3902359027cb steps: - uses: actions/checkout@v1 - run: make fmt lint: runs-on: ubuntu-latest - container: nhooyr/websocket-ci@sha256:54a12b52be98d2d1588a054cfce35d17705c9b45546478d8bcdbac2a89a90001 + container: nhooyr/websocket-ci@sha256:ea94e078d2d589d654a2c759d952bf4199c754d80dadb20696dc3902359027cb steps: - uses: actions/checkout@v1 - run: make lint test: runs-on: ubuntu-latest - container: nhooyr/websocket-ci@sha256:54a12b52be98d2d1588a054cfce35d17705c9b45546478d8bcdbac2a89a90001 + container: nhooyr/websocket-ci@sha256:ea94e078d2d589d654a2c759d952bf4199c754d80dadb20696dc3902359027cb steps: - uses: actions/checkout@v1 - run: make test diff --git a/ci/image/Dockerfile b/ci/image/Dockerfile index 51fdb69b15ca7713f31dc7f1ab488374280e4786..7fd5544a0018672a6394762a03f892bad64dd461 100644 --- a/ci/image/Dockerfile +++ b/ci/image/Dockerfile @@ -10,7 +10,7 @@ ENV PATH=$GOPATH/bin:$PATH ENV GOFLAGS="-mod=readonly" ENV PAGER=cat ENV CI=true -ENV MAKEFLAGS="-j --output-sync target" +ENV MAKEFLAGS="--jobs=8 --output-sync=target" COPY ./ci/image/gitignore /root/.config/git/ignore RUN git config --system color.ui always diff --git a/ci/wasmtest.sh b/ci/wasmtest.sh index 66d397a2c98665ab4f76a8bb3f4f0d1e555baf7e..586efec28ef487ba7354aa6f2dcbc7746818e1bc 100755 --- a/ci/wasmtest.sh +++ b/ci/wasmtest.sh @@ -4,7 +4,7 @@ set -euo pipefail wsjstestOut="$(mktemp -d)/wsjstestOut" mkfifo "$wsjstestOut" -timeout 15s wsjstest > "$wsjstestOut" & +timeout 45s wsjstest > "$wsjstestOut" & wsjstestPID="$!" WS_ECHO_SERVER_URL="$(head -n 1 "$wsjstestOut")" diff --git a/websocket_js.go b/websocket_js.go index 334034985840ad1f0c0f3b3099ced78633a3b79c..f297f9d4f6147ca15d3bb6c789315532da57f774 100644 --- a/websocket_js.go +++ b/websocket_js.go @@ -242,7 +242,7 @@ type DialOptions struct { func Dial(ctx context.Context, url string, opts *DialOptions) (*Conn, *http.Response, error) { c, resp, err := dial(ctx, url, opts) if err != nil { - return nil, resp, fmt.Errorf("failed to websocket dial: %w", err) + return nil, resp, fmt.Errorf("failed to websocket dial %q: %w", url, err) } return c, resp, nil }