Skip to content

Commit 118ea68

Browse files
nhooyrmaggie44
nhooyr
and
maggie44
committed
ci: Fixes
Credits to @maggie44 for making me add staticcheck. See #407 Co-authored-by: maggie0002 <64841595+maggie0002@users.noreply.github.com>
1 parent c45cd4c commit 118ea68

File tree

11 files changed

+103
-172
lines changed

11 files changed

+103
-172
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎.github/workflows/ci.yml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: ci
2+
on: [push, pull_request]
3+
concurrency:
4+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
5+
cancel-in-progress: true
6+
7+
jobs:
8+
fmt:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@v4
12+
- uses: actions/setup-go@v4
13+
with:
14+
go-version-file: ./go.mod
15+
- run: ./ci/fmt.sh
16+
17+
lint:
18+
runs-on: ubuntu-latest
19+
steps:
20+
- uses: actions/checkout@v4
21+
- run: go version
22+
- uses: actions/setup-go@v4
23+
with:
24+
go-version-file: ./go.mod
25+
- run: ./ci/lint.sh
26+
27+
test:
28+
runs-on: ubuntu-latest
29+
steps:
30+
- uses: actions/checkout@v4
31+
- uses: actions/setup-go@v4
32+
with:
33+
go-version-file: ./go.mod
34+
- run: ./ci/test.sh
35+
- uses: actions/upload-artifact@v2
36+
if: always()
37+
with:
38+
name: coverage.html
39+
path: ./ci/out/coverage.html

‎ci/all.sh‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎ci/container/Dockerfile‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎ci/fmt.sh‎

Lines changed: 15 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,18 @@
1-
#!/usr/bin/env bash
2-
set -euo pipefail
1+
#!/bin/sh
2+
set -eu
3+
cd -- "$(dirname "$0")/.."
34

4-
main() {
5-
cd "$(dirname "$0")/.."
5+
go mod tidy
6+
gofmt -w -s .
7+
go run golang.org/x/tools/cmd/goimports@latest -w "-local=$(go list -m)" .
68

7-
go mod tidy
8-
gofmt -w -s .
9-
goimports -w "-local=$(go list -m)" .
9+
npx prettier@3.0.3 \
10+
--write \
11+
--log-level=warn \
12+
--print-width=90 \
13+
--no-semi \
14+
--single-quote \
15+
--arrow-parens=avoid \
16+
$(git ls-files "*.yml" "*.md" "*.js" "*.css" "*.html")
1017

11-
prettier \
12-
--write \
13-
--print-width=120 \
14-
--no-semi \
15-
--trailing-comma=all \
16-
--loglevel=warn \
17-
--arrow-parens=avoid \
18-
$(git ls-files "*.yml" "*.md" "*.js" "*.css" "*.html")
19-
shfmt -i 2 -w -s -sr $(git ls-files "*.sh")
20-
21-
stringer -type=opcode,MessageType,StatusCode -output=stringer.go
22-
23-
if [[ ${CI-} ]]; then
24-
assert_no_changes
25-
fi
26-
}
27-
28-
assert_no_changes() {
29-
if [[ $(git ls-files --other --modified --exclude-standard) ]]; then
30-
git -c color.ui=always --no-pager diff
31-
echo
32-
echo "Please run the following locally:"
33-
echo " ./ci/fmt.sh"
34-
exit 1
35-
fi
36-
}
37-
38-
main "$@"
18+
go run golang.org/x/tools/cmd/stringer@latest -type=opcode,MessageType,StatusCode -output=stringer.go

‎ci/lint.sh‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
1-
#!/usr/bin/env bash
2-
set -euo pipefail
1+
#!/bin/sh
2+
set -eu
3+
cd -- "$(dirname "$0")/.."
34

4-
main() {
5-
cd "$(dirname "$0")/.."
5+
go vet ./...
6+
GOOS=js GOARCH=wasm go vet ./...
67

7-
go vet ./...
8-
GOOS=js GOARCH=wasm go vet ./...
8+
go install golang.org/x/lint/golint@latest
9+
golint -set_exit_status ./...
10+
GOOS=js GOARCH=wasm golint -set_exit_status ./...
911

10-
golint -set_exit_status ./...
11-
GOOS=js GOARCH=wasm golint -set_exit_status ./...
12-
13-
shellcheck --exclude=SC2046 $(git ls-files "*.sh")
14-
}
15-
16-
main "$@"
12+
go install honnef.co/go/tools/cmd/staticcheck@latest
13+
staticcheck ./...
14+
GOOS=js GOARCH=wasm staticcheck ./...

‎ci/test.sh‎

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,14 @@
1-
#!/usr/bin/env bash
2-
set -euo pipefail
1+
#!/bin/sh
2+
set -eu
3+
cd -- "$(dirname "$0")/.."
34

4-
main() {
5-
cd "$(dirname "$0")/.."
5+
go install github.com/agnivade/wasmbrowsertest@latest
6+
go test --race --timeout=1h --covermode=atomic --coverprofile=ci/out/coverage.prof --coverpkg=./... "$@" ./...
7+
sed -i.bak '/stringer\.go/d' ci/out/coverage.prof
8+
sed -i.bak '/nhooyr.io\/websocket\/internal\/test/d' ci/out/coverage.prof
9+
sed -i.bak '/examples/d' ci/out/coverage.prof
610

7-
go test -timeout=30m -covermode=atomic -coverprofile=ci/out/coverage.prof -coverpkg=./... "$@" ./...
8-
sed -i.bak '/stringer\.go/d' ci/out/coverage.prof
9-
sed -i.bak '/nhooyr.io\/websocket\/internal\/test/d' ci/out/coverage.prof
10-
sed -i.bak '/examples/d' ci/out/coverage.prof
11+
# Last line is the total coverage.
12+
go tool cover -func ci/out/coverage.prof | tail -n1
1113

12-
# Last line is the total coverage.
13-
go tool cover -func ci/out/coverage.prof | tail -n1
14-
15-
go tool cover -html=ci/out/coverage.prof -o=ci/out/coverage.html
16-
17-
if [[ ${CI-} && ${GITHUB_REF-} == *master ]]; then
18-
local deployDir
19-
deployDir="$(mktemp -d)"
20-
cp ci/out/coverage.html "$deployDir/index.html"
21-
netlify deploy --prod "--dir=$deployDir"
22-
fi
23-
}
24-
25-
main "$@"
14+
go tool cover -html=ci/out/coverage.prof -o=ci/out/coverage.html

‎examples/chat/index.css‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ body {
5454
margin: 0 0 0 10px;
5555
}
5656

57-
#publish-form input[type="text"] {
57+
#publish-form input[type='text'] {
5858
flex-grow: 1;
5959

6060
-moz-appearance: none;
@@ -64,18 +64,18 @@ body {
6464
border: 1px solid #ccc;
6565
}
6666

67-
#publish-form input[type="submit"] {
67+
#publish-form input[type='submit'] {
6868
color: white;
6969
background-color: black;
7070
border-radius: 5px;
7171
padding: 5px 10px;
7272
border: none;
7373
}
7474

75-
#publish-form input[type="submit"]:hover {
75+
#publish-form input[type='submit']:hover {
7676
background-color: red;
7777
}
7878

79-
#publish-form input[type="submit"]:active {
79+
#publish-form input[type='submit']:active {
8080
background-color: red;
8181
}

‎examples/chat/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!DOCTYPE html>
1+
<!doctype html>
22
<html lang="en-CA">
33
<head>
44
<meta charset="UTF-8" />

‎examples/chat/index.js‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@
66
function dial() {
77
const conn = new WebSocket(`ws://${location.host}/subscribe`)
88

9-
conn.addEventListener("close", ev => {
9+
conn.addEventListener('close', ev => {
1010
appendLog(`WebSocket Disconnected code: ${ev.code}, reason: ${ev.reason}`, true)
1111
if (ev.code !== 1001) {
12-
appendLog("Reconnecting in 1s", true)
12+
appendLog('Reconnecting in 1s', true)
1313
setTimeout(dial, 1000)
1414
}
1515
})
16-
conn.addEventListener("open", ev => {
17-
console.info("websocket connected")
16+
conn.addEventListener('open', ev => {
17+
console.info('websocket connected')
1818
})
1919

2020
// This is where we handle messages received.
21-
conn.addEventListener("message", ev => {
22-
if (typeof ev.data !== "string") {
23-
console.error("unexpected message type", typeof ev.data)
21+
conn.addEventListener('message', ev => {
22+
if (typeof ev.data !== 'string') {
23+
console.error('unexpected message type', typeof ev.data)
2424
return
2525
}
2626
const p = appendLog(ev.data)
@@ -32,38 +32,38 @@
3232
}
3333
dial()
3434

35-
const messageLog = document.getElementById("message-log")
36-
const publishForm = document.getElementById("publish-form")
37-
const messageInput = document.getElementById("message-input")
35+
const messageLog = document.getElementById('message-log')
36+
const publishForm = document.getElementById('publish-form')
37+
const messageInput = document.getElementById('message-input')
3838

3939
// appendLog appends the passed text to messageLog.
4040
function appendLog(text, error) {
41-
const p = document.createElement("p")
41+
const p = document.createElement('p')
4242
// Adding a timestamp to each message makes the log easier to read.
4343
p.innerText = `${new Date().toLocaleTimeString()}: ${text}`
4444
if (error) {
45-
p.style.color = "red"
46-
p.style.fontStyle = "bold"
45+
p.style.color = 'red'
46+
p.style.fontStyle = 'bold'
4747
}
4848
messageLog.append(p)
4949
return p
5050
}
51-
appendLog("Submit a message to get started!")
51+
appendLog('Submit a message to get started!')
5252

5353
// onsubmit publishes the message from the user when the form is submitted.
5454
publishForm.onsubmit = async ev => {
5555
ev.preventDefault()
5656

5757
const msg = messageInput.value
58-
if (msg === "") {
58+
if (msg === '') {
5959
return
6060
}
61-
messageInput.value = ""
61+
messageInput.value = ''
6262

6363
expectingMessage = true
6464
try {
65-
const resp = await fetch("/publish", {
66-
method: "POST",
65+
const resp = await fetch('/publish', {
66+
method: 'POST',
6767
body: msg,
6868
})
6969
if (resp.status !== 202) {

0 commit comments

Comments
 (0)