Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .github/actions/setup-go/action.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: setup-go
description: Setup Go using the version from go.mod, with standard cache configuration
description: Setup the latest Go patch release, with standard cache configuration
inputs:
working-directory:
description: Path prefix for go.mod / go.sum files (used when the repo is checked out into a subdirectory)
description: Path prefix for go.sum files (used when the repo is checked out into a subdirectory)
required: false
default: "."
cache:
Expand All @@ -14,7 +14,8 @@ runs:
steps:
- uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7.0.0
with:
go-version-file: ${{ inputs.working-directory }}/go.mod
# The go directive of go.mod is a minimum, not the version to build with
go-version: "1.27"
cache-dependency-path: |
${{ inputs.working-directory }}/go.sum
${{ inputs.working-directory }}/caddy/go.sum
Expand Down
7 changes: 0 additions & 7 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,6 @@ jobs:
with:
fetch-depth: 0
persist-credentials: false
# A patch release in go.mod stops setup-go from picking the latest one
- name: Reject Go patch releases in go.mod
run: |
if git ls-files -z '*go.mod' | xargs -0 grep -nE '^(toolchain |go [0-9]+\.[0-9]+\.)'; then
echo "::error::Use the minor version only (go mod edit -go=1.N -toolchain=none)"
exit 1
fi
- name: Lint Code Base
uses: super-linter/super-linter/slim@2da136927bd4a73596db63044b504547c62cb854 # v9.0.0
env:
Expand Down
65 changes: 33 additions & 32 deletions caddy/go.mod
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
module github.com/dunglas/frankenphp/caddy

go 1.27
go 1.27.3

replace github.com/dunglas/frankenphp => ../

retract v1.0.0-rc.1 // Human error

require (
github.com/caddyserver/caddy/v2 v2.11.7
github.com/caddyserver/caddy/v2 v2.11.9
github.com/caddyserver/certmagic v0.25.6
github.com/dunglas/caddy-cbrotli v1.0.1
github.com/dunglas/frankenphp v1.13.4
github.com/dunglas/mercure v1.1.5
github.com/dunglas/mercure/caddy v1.1.5
github.com/dunglas/vulcain/caddy v1.4.5
github.com/dunglas/mercure v1.1.6
github.com/dunglas/mercure/caddy v1.1.6
github.com/dunglas/vulcain/caddy v1.4.6
github.com/prometheus/client_golang v1.25.0
github.com/spf13/cobra v1.10.2
github.com/stretchr/testify v1.12.1
go.uber.org/zap/exp v0.3.0
)

require (
cel.dev/cel-go v0.32.0 // indirect
cel.dev/cel-go v0.33.2 // indirect
cel.dev/expr v0.25.3 // indirect
cloud.google.com/go/auth v0.24.1 // indirect
cloud.google.com/go/auth/oauth2adapt v0.3.0 // indirect
cloud.google.com/go/auth v0.24.2 // indirect
cloud.google.com/go/auth/oauth2adapt v0.3.1 // indirect
cloud.google.com/go/compute/metadata v0.10.0 // indirect
dario.cat/mergo v1.0.2 // indirect
filippo.io/bigmod v0.1.0 // indirect
Expand All @@ -37,14 +37,14 @@ require (
github.com/Masterminds/semver/v3 v3.5.0 // indirect
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
github.com/MauriceGit/skiplist v0.0.0-20211105230623-77f5c8d3e145 // indirect
github.com/MicahParks/jwkset v0.11.3 // indirect
github.com/MicahParks/keyfunc/v3 v3.8.2 // indirect
github.com/MicahParks/jwkset v0.11.4 // indirect
github.com/MicahParks/keyfunc/v3 v3.9.1 // indirect
github.com/RoaringBitmap/roaring/v2 v2.30.0 // indirect
github.com/alecthomas/chroma/v2 v2.27.0 // indirect
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
github.com/aryann/difflib v0.0.0-20210328193216-ff5ff6dc229b // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bits-and-blooms/bitset v1.26.0 // indirect
github.com/bits-and-blooms/bitset v1.29.0 // indirect
github.com/caddyserver/zerossl v0.1.6 // indirect
github.com/ccoveille/go-safecast/v2 v2.0.1 // indirect
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
Expand All @@ -58,20 +58,20 @@ require (
github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
github.com/dgraph-io/ristretto v0.2.0 // indirect
github.com/dgryski/go-farm v0.0.0-20240924180020-3414d57e47da // indirect
github.com/dlclark/regexp2/v2 v2.10.0 // indirect
github.com/dlclark/regexp2/v2 v2.12.0 // indirect
github.com/dunglas/go-urlpattern v1.0.0 // indirect
github.com/dunglas/httpsfv v1.1.2 // indirect
github.com/dunglas/skipfilter v1.2.0 // indirect
github.com/dunglas/vulcain v1.4.5 // indirect
github.com/dunglas/vulcain v1.4.6 // indirect
github.com/dustin/go-humanize v1.1.0 // indirect
github.com/e-dant/watcher v0.0.0-20260223030516-06f84a1314be // indirect
github.com/elnormous/contenttype v1.0.4 // indirect
github.com/felixge/httpsnoop v1.1.0 // indirect
github.com/fxamacker/cbor/v2 v2.9.6 // indirect
github.com/fxamacker/cbor/v2 v2.10.0 // indirect
github.com/getkin/kin-openapi v0.152.0 // indirect
github.com/go-chi/chi/v5 v5.5.0 // indirect
github.com/go-jose/go-jose/v3 v3.0.5 // indirect
github.com/go-jose/go-jose/v4 v4.1.6 // indirect
github.com/go-jose/go-jose/v4 v4.1.8 // indirect
github.com/go-logr/logr v1.4.4 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/jsonpointer v1.0.2 // indirect
Expand All @@ -86,19 +86,19 @@ require (
github.com/google/go-tspi v0.3.0 // indirect
github.com/google/s2a-go v0.1.11 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.24 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.25 // indirect
github.com/googleapis/gax-go/v2 v2.27.0 // indirect
github.com/gorilla/handlers v1.5.2 // indirect
github.com/gorilla/mux v1.8.1 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.32.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.33.0 // indirect
github.com/huandu/xstrings v1.6.3 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
github.com/jackc/pgx/v5 v5.11.0 // indirect
github.com/jackc/pgx/v5 v5.12.0 // indirect
github.com/jackc/puddle/v2 v2.2.3 // indirect
github.com/klauspost/compress v1.20.3 // indirect
github.com/klauspost/cpuid/v2 v2.4.1 // indirect
github.com/klauspost/cpuid/v2 v2.4.2 // indirect
github.com/kylelemons/godebug v1.1.0 // indirect
github.com/libdns/libdns v1.1.1 // indirect
github.com/manifoldco/promptui v0.9.0 // indirect
Expand All @@ -114,13 +114,14 @@ require (
github.com/mschoch/smat v0.2.0 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/nlnwa/whatwg-url v0.6.2 // indirect
github.com/oasdiff/yaml v0.1.1 // indirect
github.com/oasdiff/yaml3 v0.0.14 // indirect
github.com/oasdiff/yaml v0.1.3 // indirect
github.com/oasdiff/yaml3 v0.0.16 // indirect
github.com/pandatix/go-abnf v0.5.5 // indirect
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
github.com/pires/go-proxyproto v0.16.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_model v0.6.3 // indirect
github.com/prometheus/common v0.72.1 // indirect
github.com/prometheus/common v0.73.1 // indirect
github.com/prometheus/otlptranslator v1.0.0 // indirect
github.com/prometheus/procfs v0.23.0 // indirect
github.com/quic-go/qpack v0.6.0 // indirect
Expand All @@ -132,7 +133,7 @@ require (
github.com/shopspring/decimal v1.6.0 // indirect
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
github.com/sirupsen/logrus v1.10.2 // indirect
github.com/slackhq/nebula v1.11.2 // indirect
github.com/slackhq/nebula v1.12.0 // indirect
github.com/smallstep/certificates v0.30.2 // indirect
github.com/smallstep/cli-utils v0.12.2 // indirect
github.com/smallstep/go-attestation v0.4.9 // indirect
Expand All @@ -149,7 +150,7 @@ require (
github.com/urfave/cli v1.22.17 // indirect
github.com/x448/float16 v0.8.4 // indirect
github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
github.com/yuin/goldmark v1.8.6 // indirect
github.com/yuin/goldmark v1.8.7 // indirect
github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc // indirect
github.com/zeebo/blake3 v0.2.4 // indirect
go.etcd.io/bbolt v1.5.0 // indirect
Expand Down Expand Up @@ -181,25 +182,25 @@ require (
go.opentelemetry.io/otel/sdk/metric v1.47.0 // indirect
go.opentelemetry.io/otel/trace v1.47.0 // indirect
go.opentelemetry.io/proto/otlp v1.11.1 // indirect
go.step.sm/crypto v0.91.0 // indirect
go.step.sm/crypto v0.91.1 // indirect
go.uber.org/automaxprocs v1.6.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.28.0 // indirect
go.yaml.in/yaml/v3 v3.0.5 // indirect
go.yaml.in/yaml/v3 v3.0.6 // indirect
golang.org/x/crypto v0.58.0 // indirect
golang.org/x/crypto/x509roots/fallback v0.0.0-20261020153306-9f2b28d4331a // indirect
golang.org/x/crypto/x509roots/fallback v0.0.0-20261103070834-3d426ad4de97 // indirect
golang.org/x/exp v0.0.0-20261014143641-f0251eb4aa3e // indirect
golang.org/x/net v0.61.0 // indirect
golang.org/x/net v0.62.0 // indirect
golang.org/x/oauth2 v0.37.0 // indirect
golang.org/x/sync v0.24.0 // indirect
golang.org/x/sys v0.49.0 // indirect
golang.org/x/term v0.47.0 // indirect
golang.org/x/text v0.43.0 // indirect
golang.org/x/time v0.16.0 // indirect
google.golang.org/api v0.308.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20261019180522-ce908d29299b // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20261019180522-ce908d29299b // indirect
google.golang.org/grpc v1.84.0 // indirect
google.golang.org/api v0.311.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20261104224025-d1e00e9f33ab // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20261104224025-d1e00e9f33ab // indirect
google.golang.org/grpc v1.85.0 // indirect
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2 // indirect
google.golang.org/protobuf v1.36.12 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
Loading
Loading