aboutsummaryrefslogtreecommitdiffhomepage
path: root/.github
diff options
context:
space:
mode:
authorMarten Seemann <[email protected]>2023-07-21 21:00:48 -0700
committerGitHub <[email protected]>2023-07-21 22:00:48 -0600
commitf45a6de20dd19e82e58c85b37e03957b2203b544 (patch)
treecc8152b73fd31c09111dfb0034960a0c20d6ff67 /.github
parentb51dc5d5d0b8764165170af1f54b77d6de8cb5a1 (diff)
downloadcaddy-f45a6de20dd19e82e58c85b37e03957b2203b544.tar.gz
caddy-f45a6de20dd19e82e58c85b37e03957b2203b544.zip
go.mod: Update quic-go to v0.37.0, bump to Go 1.20 minimum (#5644)
* update quic-go to v0.37.0 * Bump to Go 1.20 * Bump golangci-lint version, yml syntax consistency * Use skip-pkg-cache workaround * Workaround needed for both? * Seeding weakrand is no longer necessary --------- Co-authored-by: Matt Holt <[email protected]> Co-authored-by: Francis Lavoie <[email protected]>
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/ci.yml17
-rw-r--r--.github/workflows/cross-build.yml18
-rw-r--r--.github/workflows/lint.yml17
-rw-r--r--.github/workflows/release.yml8
-rw-r--r--.github/workflows/release_published.yml3
5 files changed, 47 insertions, 16 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6948db06e..3ab72421d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,17 +18,22 @@ jobs:
# Default is true, cancels jobs for other platforms in the matrix if one fails
fail-fast: false
matrix:
- os: [ ubuntu-latest, macos-latest, windows-latest ]
- go: [ '1.19', '1.20' ]
+ os:
+ - ubuntu-latest
+ - macos-latest
+ - windows-latest
+ go:
+ - '1.20'
+ # - '1.21'
include:
# Set the minimum Go patch version for the given Go minor
# Usable via ${{ matrix.GO_SEMVER }}
- - go: '1.19'
- GO_SEMVER: '~1.19.6'
-
- go: '1.20'
- GO_SEMVER: '~1.20.1'
+ GO_SEMVER: '~1.20.6'
+
+ # - go: '1.21'
+ # GO_SEMVER: '~1.21.0'
# Set some variables per OS, usable via ${{ matrix.VAR }}
# CADDY_BIN_PATH: the path to the compiled Caddy binary, for artifact publishing
diff --git a/.github/workflows/cross-build.yml b/.github/workflows/cross-build.yml
index 48e9b1867..4d04cfa7d 100644
--- a/.github/workflows/cross-build.yml
+++ b/.github/workflows/cross-build.yml
@@ -15,14 +15,26 @@ jobs:
strategy:
fail-fast: false
matrix:
- goos: ['android', 'linux', 'solaris', 'illumos', 'dragonfly', 'freebsd', 'openbsd', 'plan9', 'windows', 'darwin', 'netbsd']
- go: [ '1.20' ]
+ goos:
+ - 'android'
+ - 'linux'
+ - 'solaris'
+ - 'illumos'
+ - 'dragonfly'
+ - 'freebsd'
+ - 'openbsd'
+ - 'plan9'
+ - 'windows'
+ - 'darwin'
+ - 'netbsd'
+ go:
+ - '1.20'
include:
# Set the minimum Go patch version for the given Go minor
# Usable via ${{ matrix.GO_SEMVER }}
- go: '1.20'
- GO_SEMVER: '~1.20.1'
+ GO_SEMVER: '~1.20.6'
runs-on: ubuntu-latest
continue-on-error: true
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 951b74631..964e48f06 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -22,20 +22,31 @@ jobs:
name: lint
strategy:
matrix:
- os: [ubuntu-latest, macos-latest, windows-latest]
+ os:
+ - ubuntu-latest
+ - macos-latest
+ - windows-latest
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v4
with:
- go-version: '~1.19.6'
+ go-version: '~1.20.6'
check-latest: true
+ # Workaround for https://github.com/golangci/golangci-lint-action/issues/135
+ skip-pkg-cache: true
+
- name: golangci-lint
uses: golangci/golangci-lint-action@v3
with:
- version: v1.50
+ version: v1.53
+
+ # Workaround for https://github.com/golangci/golangci-lint-action/issues/135
+ skip-pkg-cache: true
+
# Windows times out frequently after about 5m50s if we don't set a longer timeout.
args: --timeout 10m
+
# Optional: show only new issues if it's a pull request. The default value is `false`.
# only-new-issues: true
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e8c332df0..38307611f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,14 +10,16 @@ jobs:
name: Release
strategy:
matrix:
- os: [ ubuntu-latest ]
- go: [ '1.20' ]
+ os:
+ - ubuntu-latest
+ go:
+ - '1.20'
include:
# Set the minimum Go patch version for the given Go minor
# Usable via ${{ matrix.GO_SEMVER }}
- go: '1.20'
- GO_SEMVER: '~1.20.1'
+ GO_SEMVER: '~1.20.6'
runs-on: ${{ matrix.os }}
# https://github.com/sigstore/cosign/issues/1258#issuecomment-1002251233
diff --git a/.github/workflows/release_published.yml b/.github/workflows/release_published.yml
index 7736e852c..f304888e8 100644
--- a/.github/workflows/release_published.yml
+++ b/.github/workflows/release_published.yml
@@ -10,7 +10,8 @@ jobs:
name: Release Published
strategy:
matrix:
- os: [ ubuntu-latest ]
+ os:
+ - ubuntu-latest
runs-on: ${{ matrix.os }}
steps: