Skip to content

Commit 355cba8

Browse files
committed
Merge branch 'gorilla/main'
2 parents 42c08d8 + a62d9d2 commit 355cba8

40 files changed

+341
-790
lines changed

.editorconfig

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

.github/release-drafter.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Config for https://github.com/apps/release-drafter
2+
template: |
3+
4+
<summary of changes here>
5+
6+
## CHANGELOG
7+
$CHANGES

.github/workflows/build.yml

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

.github/workflows/security.yml

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

.github/workflows/test.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,15 @@ on: [push, pull_request]
33
jobs:
44
test:
55
strategy:
6-
fail-fast: false
76
matrix:
8-
go-version: [1.19.x, 1.20.x, 1.21.x, 1.22.x]
9-
os: [ubuntu-latest, macos-latest, windows-latest]
7+
go-version: [1.20.x, 1.21.x, 1.22.x]
8+
os: [ubuntu-latest, macos-latest, windows-latest, macos-14]
109
runs-on: ${{ matrix.os }}
1110
steps:
1211
- uses: actions/checkout@v4
13-
- uses: actions/setup-go@v4
12+
- uses: actions/setup-go@v5
1413
with:
1514
go-version: ${{ matrix.go-version }}
1615
- run: go version
17-
- run: go get -t -v ./...
18-
- run: go vet $(go list ./... | grep -v /vendor/)
19-
20-
- run: go test -v -cover -race ./...
16+
- run: go test -v -cover -shuffle=on ./...
17+
- run: go test -v -cover -shuffle=on -race ./...

.github/workflows/verify.yml

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

.golangci.yml

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

AUTHORS

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# This is the official list of Gorilla WebSocket authors for copyright
2+
# purposes.
3+
#
4+
# Please keep the list sorted.
5+
6+
Gary Burd <[email protected]>
7+
Google LLC (https://opensource.google.com/)
8+
Joachim Bauch <[email protected]>
9+

LICENSE

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,22 @@
1-
Copyright (c) 2023 The Gorilla Authors. All rights reserved.
1+
Copyright (c) 2013 The Gorilla WebSocket Authors. All rights reserved.
22

33
Redistribution and use in source and binary forms, with or without
4-
modification, are permitted provided that the following conditions are
5-
met:
4+
modification, are permitted provided that the following conditions are met:
65

7-
* Redistributions of source code must retain the above copyright
8-
notice, this list of conditions and the following disclaimer.
9-
* Redistributions in binary form must reproduce the above
10-
copyright notice, this list of conditions and the following disclaimer
11-
in the documentation and/or other materials provided with the
12-
distribution.
13-
* Neither the name of Google Inc. nor the names of its
14-
contributors may be used to endorse or promote products derived from
15-
this software without specific prior written permission.
6+
Redistributions of source code must retain the above copyright notice, this
7+
list of conditions and the following disclaimer.
168

17-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
18-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
19-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
20-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
21-
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
22-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
23-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
24-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
25-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
9+
Redistributions in binary form must reproduce the above copyright notice,
10+
this list of conditions and the following disclaimer in the documentation
11+
and/or other materials provided with the distribution.
12+
13+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
14+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
15+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
16+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
17+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
18+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
19+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
20+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
21+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
2722
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Makefile

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

0 commit comments

Comments
 (0)