Fast and extensible multi-platform HTTP/1-2-3 web server with automatic HTTPS
Mirrored from https://github.com/Slazee/caddy.git
Synced Nov 13, 20:30 UTC
ci: Build on Go 1.18, bump actions versions (#4637)
* ci: Build on Go 1.18, bump actions versions * Revert linter version bump for now * Try linter again
Francis Lavoie committed
Mar 15, 2022 at 18:09 UTC
4e9fbee1e2ef39ff56bdfb19126a9b1a8a841eb4
15 files changed
+33
-18
.github/workflows/ci.yml
+5
-5
@@ -19,7 +19,7 @@ jobs:
19
fail-fast: false
20
matrix:
21
os: [ ubuntu-latest, macos-latest, windows-latest ]
22
- go: [ '1.16', '1.17' ]
22
+ go: [ '1.16', '1.17', '1.18' ]
23
24
# Set some variables per OS, usable via ${{ matrix.VAR }}
25
# CADDY_BIN_PATH: the path to the compiled Caddy binary, for artifact publishing
@@ -41,12 +41,12 @@ jobs:
41
42
steps:
43
- name: Install Go
44
- uses: actions/setup-go@v2
44
+ uses: actions/setup-go@v3
45
with:
46
go-version: ${{ matrix.go }}
47
48
- name: Checkout code
49
- uses: actions/checkout@v2
49
+ uses: actions/checkout@v3
50
51
# These tools would be useful if we later decide to reinvestigate
52
# publishing test/coverage reports to some tool for easier consumption
@@ -130,7 +130,7 @@ jobs:
130
continue-on-error: true # August 2020: s390x VM is down due to weather and power issues
131
steps:
132
- name: Checkout code into the Go module directory
133
- uses: actions/checkout@v2
133
+ uses: actions/checkout@v3
134
- name: Run Tests
135
run: |
136
mkdir -p ~/.ssh && echo -e "${SSH_KEY//_/\\n}" > ~/.ssh/id_ecdsa && chmod og-rwx ~/.ssh/id_ecdsa
@@ -155,7 +155,7 @@ jobs:
155
runs-on: ubuntu-latest
156
steps:
157
- name: checkout
158
- uses: actions/checkout@v2
158
+ uses: actions/checkout@v3
159
160
- uses: goreleaser/goreleaser-action@v2
161
with:
.github/workflows/cross-build.yml
+3
-3
@@ -16,12 +16,12 @@ jobs:
16
fail-fast: false
17
matrix:
18
goos: ['android', 'linux', 'solaris', 'illumos', 'dragonfly', 'freebsd', 'openbsd', 'plan9', 'windows', 'darwin', 'netbsd']
19
- go: [ '1.17' ]
19
+ go: [ '1.18' ]
20
runs-on: ubuntu-latest
21
continue-on-error: true
22
steps:
23
- name: Install Go
24
- uses: actions/setup-go@v2
24
+ uses: actions/setup-go@v3
25
with:
26
go-version: ${{ matrix.go }}
27
@@ -45,7 +45,7 @@ jobs:
45
cross-build-go${{ matrix.go }}-${{ matrix.goos }}
46
47
- name: Checkout code into the Go module directory
48
- uses: actions/checkout@v2
48
+ uses: actions/checkout@v3
49
50
- name: Run Build
51
env:
.github/workflows/lint.yml
+7
-3
@@ -16,10 +16,14 @@ jobs:
16
name: lint
17
runs-on: ubuntu-latest
18
steps:
19
- - uses: actions/checkout@v2
19
+ - uses: actions/checkout@v3
20
+ - uses: actions/setup-go@v3
21
+ with:
22
+ go-version: 1.17
23
+
24
- name: golangci-lint
21
- uses: golangci/golangci-lint-action@v2
25
+ uses: golangci/golangci-lint-action@v3
26
with:
23
- version: v1.31
27
+ version: v1.44
28
# Optional: show only new issues if it's a pull request. The default value is `false`.
29
# only-new-issues: true
.github/workflows/release.yml
+4
-4
@@ -11,22 +11,22 @@ jobs:
11
strategy:
12
matrix:
13
os: [ ubuntu-latest ]
14
- go: [ '1.17' ]
14
+ go: [ '1.18' ]
15
runs-on: ${{ matrix.os }}
16
17
steps:
18
- name: Install Go
19
- uses: actions/setup-go@v2
19
+ uses: actions/setup-go@v3
20
with:
21
go-version: ${{ matrix.go }}
22
23
- name: Checkout code
24
- uses: actions/checkout@v2
24
+ uses: actions/checkout@v3
25
with:
26
fetch-depth: 0
27
28
# Force fetch upstream tags -- because 65 minutes
29
- # tl;dr: actions/checkout@v2 runs this line:
29
+ # tl;dr: actions/checkout@v3 runs this line:
30
# git -c protocol.version=2 fetch --no-tags --prune --progress --no-recurse-submodules --depth=1 origin +ebc278ec98bb24f2852b61fde2a9bf2e3d83818b:refs/tags/
31
# which makes its own local lightweight tag, losing all the annotations in the process. Our earlier script ran:
32
# git fetch --prune --unshallow
caddyconfig/caddyfile/formatter_fuzz.go
+1
@@ -12,6 +12,7 @@
12
// See the License for the specific language governing permissions and
13
// limitations under the License.
14
15
+//go:build gofuzz
16
// +build gofuzz
17
18
package caddyfile
caddyconfig/caddyfile/lexer_fuzz.go
+1
@@ -12,6 +12,7 @@
12
// See the License for the specific language governing permissions and
13
// limitations under the License.
14
15
+//go:build gofuzz
16
// +build gofuzz
17
18
package caddyfile
caddyconfig/httpcaddyfile/addresses_fuzz.go
+1
@@ -12,6 +12,7 @@
12
// See the License for the specific language governing permissions and
13
// limitations under the License.
14
15
+//go:build gofuzz
16
// +build gofuzz
17
18
package httpcaddyfile
duration_fuzz.go
+1
@@ -12,6 +12,7 @@
12
// See the License for the specific language governing permissions and
13
// limitations under the License.
14
15
+//go:build gofuzz
16
// +build gofuzz
17
18
package caddy
go.mod
+1
-1
@@ -16,7 +16,7 @@ require (
16
github.com/google/uuid v1.3.0
17
github.com/klauspost/compress v1.15.0
18
github.com/klauspost/cpuid/v2 v2.0.11
19
- github.com/lucas-clemente/quic-go v0.24.0
19
+ github.com/lucas-clemente/quic-go v0.25.0
20
github.com/mholt/acmez v1.0.2
21
github.com/naoina/go-stringutil v0.1.0 // indirect
22
github.com/naoina/toml v0.1.1
go.sum
+4
-2
@@ -664,8 +664,8 @@ github.com/libdns/libdns v0.2.1 h1:Wu59T7wSHRgtA0cfxC+n1c/e+O3upJGWytknkmFEDis=
664
github.com/libdns/libdns v0.2.1/go.mod h1:yQCXzk1lEZmmCPa857bnk4TsOiqYasqpyOEeSObbb40=
665
github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM=
666
github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4=
667
-github.com/lucas-clemente/quic-go v0.24.0 h1:ToR7SIIEdrgOhgVTHvPgdVRJfgVy+N0wQAagH7L4d5g=
668
-github.com/lucas-clemente/quic-go v0.24.0/go.mod h1:paZuzjXCE5mj6sikVLMvqXk8lJV2AsqtJ6bDhjEfxx0=
667
+github.com/lucas-clemente/quic-go v0.25.0 h1:K+X9Gvd7JXsOHtU0N2icZ2Nw3rx82uBej3mP4CLgibc=
668
+github.com/lucas-clemente/quic-go v0.25.0/go.mod h1:YtzP8bxRVCBlO77yRanE264+fY/T2U9ZlW1AaHOsMOg=
669
github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI=
670
github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ=
671
github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
@@ -680,6 +680,8 @@ github.com/marten-seemann/qtls-go1-16 v0.1.4 h1:xbHbOGGhrenVtII6Co8akhLEdrawwB2i
680
github.com/marten-seemann/qtls-go1-16 v0.1.4/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk=
681
github.com/marten-seemann/qtls-go1-17 v0.1.0 h1:P9ggrs5xtwiqXv/FHNwntmuLMNq3KaSIG93AtAZ48xk=
682
github.com/marten-seemann/qtls-go1-17 v0.1.0/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8=
683
+github.com/marten-seemann/qtls-go1-18 v0.1.0-beta.1 h1:EnzzN9fPUkUck/1CuY1FlzBaIYMoiBsdwTNmNGkwUUM=
684
+github.com/marten-seemann/qtls-go1-18 v0.1.0-beta.1/go.mod h1:PUhIQk19LoFt2174H4+an8TYvWOGjb/hHwphBeaDHwI=
685
github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
686
github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
687
github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
listeners_fuzz.go
+1
@@ -12,6 +12,7 @@
12
// See the License for the specific language governing permissions and
13
// limitations under the License.
14
15
+//go:build gofuzz
16
// +build gofuzz
17
18
package caddy
notify/notify_other.go
+1
@@ -12,6 +12,7 @@
12
// See the License for the specific language governing permissions and
13
// limitations under the License.
14
15
+//go:build !linux
16
// +build !linux
17
18
package notify
replacer_fuzz.go
+1
@@ -12,6 +12,7 @@
12
// See the License for the specific language governing permissions and
13
// limitations under the License.
14
15
+//go:build gofuzz
16
// +build gofuzz
17
18
package caddy
sigtrap_nonposix.go
+1
@@ -12,6 +12,7 @@
12
// See the License for the specific language governing permissions and
13
// limitations under the License.
14
15
+//go:build windows || plan9 || nacl || js
16
// +build windows plan9 nacl js
17
18
package caddy
sigtrap_posix.go
+1
@@ -12,6 +12,7 @@
12
// See the License for the specific language governing permissions and
13
// limitations under the License.
14
15
+//go:build !windows && !plan9 && !nacl && !js
16
// +build !windows,!plan9,!nacl,!js
17
18
package caddy