Skip to content
This repository was archived by the owner on May 24, 2023. It is now read-only.

Commit f650d5a

Browse files
authored
Merge pull request #132 from gofiber/update_fiber_go_deprecations
update fiber to v2.40.0
2 parents a7de538 + 1a9e994 commit f650d5a

File tree

6 files changed

+107
-40
lines changed

6 files changed

+107
-40
lines changed

.github/dependabot.yml

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,15 @@
22

33
version: 2
44
updates:
5-
- package-ecosystem: "gomod"
6-
directory: "/" # Location of package manifests
7-
default_labels:
8-
- "🤖 Dependencies"
9-
schedule:
10-
interval: "daily"
11-
automerged_updates:
12-
- match:
13-
dependency_name: "gofiber/fiber/*"
5+
- package-ecosystem: "gomod"
6+
directory: "/" # Location of package manifests
7+
labels:
8+
- "🤖 Dependencies"
9+
schedule:
10+
interval: daily
11+
- package-ecosystem: "github-actions"
12+
directory: "/"
13+
schedule:
14+
interval: daily
15+
labels:
16+
- "🤖 Dependencies"
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: Dependabot auto-merge
2+
on:
3+
pull_request
4+
5+
permissions:
6+
contents: write
7+
pull-requests: write
8+
9+
jobs:
10+
wait_for_checks:
11+
runs-on: ubuntu-latest
12+
if: ${{ github.actor == 'dependabot[bot]' }}
13+
steps:
14+
- name: Wait for check is finished
15+
uses: lewagon/wait-on-check-action@v1.2.0
16+
id: wait_for_checks
17+
with:
18+
ref: ${{ github.event.pull_request.head.sha || github.sha }}
19+
running-workflow-name: wait_for_checks
20+
check-regexp: Tests
21+
repo-token: ${{ secrets.PR_TOKEN }}
22+
wait-interval: 10
23+
dependabot:
24+
needs: [wait_for_checks]
25+
name: Dependabot auto-merge
26+
runs-on: ubuntu-latest
27+
if: ${{ github.actor == 'dependabot[bot]' }}
28+
steps:
29+
- name: Dependabot metadata
30+
id: metadata
31+
uses: dependabot/fetch-metadata@v1.3.5
32+
with:
33+
github-token: "${{ secrets.PR_TOKEN }}"
34+
- name: Enable auto-merge for Dependabot PRs
35+
if: ${{steps.metadata.outputs.update-type == 'version-update:semver-minor' || steps.metadata.outputs.update-type == 'version-update:semver-patch'}}
36+
run: |
37+
gh pr review --approve "$PR_URL"
38+
gh pr merge --auto --merge "$PR_URL"
39+
env:
40+
PR_URL: ${{github.event.pull_request.html_url}}
41+
GITHUB_TOKEN: ${{secrets.PR_TOKEN}}

.github/workflows/gotidy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
name: Set up Go
2121
uses: actions/setup-go@v2
2222
with:
23-
go-version: 1.13
23+
go-version: 1.16
2424
-
2525
name: Tidy
2626
run: |

.github/workflows/test.yml

Lines changed: 42 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,43 @@
1-
on: [ push, pull_request ]
2-
name: Test
1+
on:
2+
push:
3+
branches:
4+
- master
5+
pull_request:
6+
name: Tests
37
jobs:
4-
Build:
5-
strategy:
6-
matrix:
7-
go-version: [ 1.14.x, 1.15.x, 1.16.x ]
8-
platform: [ ubuntu-latest, windows-latest ]
9-
runs-on: ${{ matrix.platform }}
10-
steps:
11-
- name: Install Go
12-
uses: actions/setup-go@v1
13-
with:
14-
go-version: ${{ matrix.go-version }}
15-
- name: Fetch Repository
16-
uses: actions/checkout@v2
17-
- name: Run Test
18-
run: go test ./... -v -race
19-
8+
Tests:
9+
name: Tests
10+
strategy:
11+
matrix:
12+
go-version:
13+
- 1.16.x
14+
- 1.18.x
15+
platform:
16+
- ubuntu-latest
17+
- windows-latest
18+
runs-on: '${{ matrix.platform }}'
19+
steps:
20+
- name: Install Go
21+
uses: actions/setup-go@v3
22+
with:
23+
go-version: ${{ matrix.go-version }}
24+
- name: Setup Golang caches
25+
uses: actions/cache@v3
26+
with:
27+
# In order:
28+
# * Module download cache
29+
# * Build cache (Linux)
30+
# * Build cache (Mac)
31+
# * Build cache (Windows)
32+
path: |
33+
~/go/pkg/mod
34+
~/.cache/go-build
35+
~/Library/Caches/go-build
36+
~\AppData\Local\go-build
37+
key: ${{ runner.os }}-go-${{ matrix.go-version }}-${{ hashFiles('**/go.sum') }}
38+
restore-keys: |
39+
${{ runner.os }}-go-${{ matrix.go-version }}-
40+
- name: Fetch Repository
41+
uses: actions/checkout@v3.1.0
42+
- name: Run Test
43+
run: go test ./... -v -race

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
module github.com/gofiber/websocket/v2
22

3-
go 1.14
3+
go 1.16
44

55
require (
66
github.com/fasthttp/websocket v1.5.0
7-
github.com/gofiber/fiber/v2 v2.39.0
8-
github.com/valyala/fasthttp v1.40.0
7+
github.com/gofiber/fiber/v2 v2.40.0
8+
github.com/valyala/fasthttp v1.41.0
99
)

go.sum

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY
22
github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
33
github.com/fasthttp/websocket v1.5.0 h1:B4zbe3xXyvIdnqjOZrafVFklCUq5ZLo/TqCt5JA1wLE=
44
github.com/fasthttp/websocket v1.5.0/go.mod h1:n0BlOQvJdPbTuBkZT0O5+jk/sp/1/VCzquR1BehI2F4=
5-
github.com/gofiber/fiber/v2 v2.39.0 h1:uhWpYQ6EHN8J7FOPYbI2hrdBD/KNZBC5CjbuOd4QUt4=
6-
github.com/gofiber/fiber/v2 v2.39.0/go.mod h1:Cmuu+elPYGqlvQvdKyjtYsjGMi69PDp8a1AY2I5B2gM=
5+
github.com/gofiber/fiber/v2 v2.40.0 h1:fdU7w5hT6PLL7jiWIhtQ+S/k5WEFYoUZidptlPu8GBo=
6+
github.com/gofiber/fiber/v2 v2.40.0/go.mod h1:Gko04sLksnHbzLSRBFWPFdzM9Ws9pRxvvIaohJK1dsk=
77
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
88
github.com/klauspost/compress v1.14.1/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
9-
github.com/klauspost/compress v1.15.0 h1:xqfchp4whNFxn5A4XFyyYtitiWI8Hy5EW59jEwcyL6U=
10-
github.com/klauspost/compress v1.15.0/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
9+
github.com/klauspost/compress v1.15.9 h1:wKRjX6JRtDdrE9qwa4b/Cip7ACOshUI4smpCQanqjSY=
10+
github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU=
1111
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
1212
github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
1313
github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
@@ -21,21 +21,20 @@ github.com/savsgio/gotils v0.0.0-20211223103454-d0aaa54c5899/go.mod h1:oejLrk1Y/
2121
github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
2222
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
2323
github.com/valyala/fasthttp v1.33.0/go.mod h1:KJRK/MXx0J+yd0c5hlR+s1tIHD72sniU8ZJjl97LIw4=
24-
github.com/valyala/fasthttp v1.40.0 h1:CRq/00MfruPGFLTQKY8b+8SfdK60TxNztjRMnH0t1Yc=
25-
github.com/valyala/fasthttp v1.40.0/go.mod h1:t/G+3rLek+CyY9bnIE+YlMRddxVAAGjhxndDB4i4C0I=
24+
github.com/valyala/fasthttp v1.41.0 h1:zeR0Z1my1wDHTRiamBCXVglQdbUwgb9uWG3k1HQz6jY=
25+
github.com/valyala/fasthttp v1.41.0/go.mod h1:f6VbjjoI3z1NDOZOv17o6RvtRSWxC77seBFc2uWtgiY=
2626
github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8=
2727
github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc=
2828
golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
2929
golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
3030
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
3131
golang.org/x/net v0.0.0-20220111093109-d55c255bac03/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
32-
golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
32+
golang.org/x/net v0.0.0-20220906165146-f3363e06e74c/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
3333
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
3434
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
3535
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
36-
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
3736
golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
38-
golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
37+
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
3938
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab h1:2QkjZIsXupsJbJIdSjjUOgWK3aEtzyuh2mPt3l/CkeU=
4039
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
4140
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=

0 commit comments

Comments
 (0)