diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 4114025..4110114 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -15,8 +15,9 @@ env: GOPRIVATE: git.marketally.com GONOSUMDB: git.marketally.com GO_VERSION: "1.25" - # GitCaddy server version to build against - GITCADDY_SERVER_VERSION: "v2.1.19" + # GitCaddy server commit to build against (pseudo-version format required since module lacks /v2 suffix) + # v2.1.19 = commit 61f2cbe2eb26 from 2026-01-17T08:21:29Z + GITCADDY_SERVER_VERSION: "v0.0.0-20260117082129-61f2cbe2eb26" jobs: lint: diff --git a/go.mod b/go.mod index 6be70b2..d22ec44 100644 --- a/go.mod +++ b/go.mod @@ -172,7 +172,7 @@ require ( ) // Use local gitcaddy-server during development -replace code.gitea.io/gitea => ../gitcaddy-server +replace code.gitea.io/gitea => git.marketally.com/gitcaddy/gitcaddy-server v0.0.0-20260117082129-61f2cbe2eb26 // Same replacements as gitcaddy-server replace github.com/jaytaylor/html2text => github.com/Necoro/html2text v0.0.0-20250804200300-7bf1ce1c7347 diff --git a/go.mod.backup b/go.mod.backup new file mode 100644 index 0000000..6be70b2 --- /dev/null +++ b/go.mod.backup @@ -0,0 +1,187 @@ +module git.marketally.com/gitcaddy/vault + +go 1.25.0 + +require ( + code.gitea.io/gitea v1.26.0 + github.com/go-chi/chi/v5 v5.2.3 + xorm.io/builder v0.3.13 + xorm.io/xorm v1.3.10 +) + +require ( + code.gitea.io/actions-proto-go v0.5.0 // indirect + codeberg.org/gusted/mcaptcha v0.0.0-20220723083913-4f3072e1d570 // indirect + dario.cat/mergo v1.0.2 // indirect + filippo.io/edwards25519 v1.1.0 // indirect + gitea.com/go-chi/binding v0.0.0-20240430071103-39a851e106ed // indirect + gitea.com/go-chi/cache v0.2.1 // indirect + gitea.com/go-chi/captcha v0.0.0-20240315150714-fb487f629098 // indirect + gitea.com/go-chi/session v0.0.0-20251124165456-68e0254e989e // indirect + gitea.com/lunny/levelqueue v0.4.2-0.20230414023320-3c0159fe0fe4 // indirect + github.com/42wim/httpsig v1.2.3 // indirect + github.com/42wim/sshsig v0.0.0-20250502153856-5100632e8920 // indirect + github.com/Azure/azure-sdk-for-go/sdk/azcore v1.19.0 // indirect + github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 // indirect + github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.2 // indirect + github.com/DataDog/zstd v1.5.7 // indirect + github.com/Microsoft/go-winio v0.6.2 // indirect + github.com/ProtonMail/go-crypto v1.3.0 // indirect + github.com/RoaringBitmap/roaring/v2 v2.10.0 // indirect + github.com/SaveTheRbtz/zstd-seekable-format-go/pkg v0.8.0 // indirect + github.com/alecthomas/chroma/v2 v2.21.1 // indirect + github.com/aymerick/douceur v0.2.0 // indirect + github.com/bits-and-blooms/bitset v1.24.0 // indirect + github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb // indirect + github.com/blevesearch/bleve/v2 v2.5.3 // indirect + github.com/blevesearch/bleve_index_api v1.2.9 // indirect + github.com/blevesearch/geo v0.2.4 // indirect + github.com/blevesearch/go-faiss v1.0.25 // indirect + github.com/blevesearch/go-porterstemmer v1.0.3 // indirect + github.com/blevesearch/gtreap v0.1.1 // indirect + github.com/blevesearch/mmap-go v1.0.4 // indirect + github.com/blevesearch/scorch_segment_api/v2 v2.3.11 // indirect + github.com/blevesearch/segment v0.9.1 // indirect + github.com/blevesearch/snowballstem v0.9.0 // indirect + github.com/blevesearch/upsidedown_store_api v1.0.2 // indirect + github.com/blevesearch/vellum v1.1.0 // indirect + github.com/blevesearch/zapx/v11 v11.4.2 // indirect + github.com/blevesearch/zapx/v12 v12.4.2 // indirect + github.com/blevesearch/zapx/v13 v13.4.2 // indirect + github.com/blevesearch/zapx/v14 v14.4.2 // indirect + github.com/blevesearch/zapx/v15 v15.4.2 // indirect + github.com/blevesearch/zapx/v16 v16.2.4 // indirect + github.com/bmatcuk/doublestar/v4 v4.9.1 // indirect + github.com/boombuler/barcode v1.1.0 // indirect + github.com/bradfitz/gomemcache v0.0.0-20250403215159-8d39553ac7cf // indirect + github.com/cespare/xxhash/v2 v2.3.0 // indirect + github.com/cloudflare/circl v1.6.1 // indirect + github.com/couchbase/go-couchbase v0.1.1 // indirect + github.com/couchbase/gomemcached v0.3.3 // indirect + github.com/couchbase/goutils v0.1.2 // indirect + github.com/cyphar/filepath-securejoin v0.4.1 // indirect + github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect + github.com/djherbis/buffer v1.2.0 // indirect + github.com/djherbis/nio/v3 v3.0.1 // indirect + github.com/dlclark/regexp2 v1.11.5 // indirect + github.com/dustin/go-humanize v1.0.1 // indirect + github.com/editorconfig/editorconfig-core-go/v2 v2.6.3 // indirect + github.com/emirpasic/gods v1.18.1 // indirect + github.com/ethantkoenig/rupture v1.0.1 // indirect + github.com/fatih/color v1.18.0 // indirect + github.com/fsnotify/fsnotify v1.9.0 // indirect + github.com/fxamacker/cbor/v2 v2.9.0 // indirect + github.com/go-enry/go-enry/v2 v2.9.2 // indirect + github.com/go-enry/go-oniguruma v1.2.1 // indirect + github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect + github.com/go-git/go-billy/v5 v5.6.2 // indirect + github.com/go-git/go-git/v5 v5.16.3 // indirect + github.com/go-ini/ini v1.67.0 // indirect + github.com/go-redsync/redsync/v4 v4.13.0 // indirect + github.com/go-sql-driver/mysql v1.9.3 // indirect + github.com/go-webauthn/webauthn v0.13.4 // indirect + github.com/go-webauthn/x v0.1.24 // indirect + github.com/goccy/go-json v0.10.5 // indirect + github.com/gogs/chardet v0.0.0-20211120154057-b7413eaefb8f // indirect + github.com/golang-jwt/jwt/v5 v5.3.0 // indirect + github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect + github.com/golang-sql/sqlexp v0.1.0 // indirect + github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect + github.com/golang/protobuf v1.5.4 // indirect + github.com/golang/snappy v1.0.0 // indirect + github.com/google/btree v1.1.3 // indirect + github.com/google/flatbuffers v25.2.10+incompatible // indirect + github.com/google/go-tpm v0.9.5 // indirect + github.com/google/pprof v0.0.0-20250820193118-f64d9cf942d6 // indirect + github.com/google/uuid v1.6.0 // indirect + github.com/gorilla/css v1.0.1 // indirect + github.com/hashicorp/errwrap v1.1.0 // indirect + github.com/hashicorp/go-multierror v1.1.1 // indirect + github.com/hashicorp/go-version v1.7.0 // indirect + github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect + github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect + github.com/josharian/intern v1.0.0 // indirect + github.com/json-iterator/go v1.1.12 // indirect + github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect + github.com/kevinburke/ssh_config v1.4.0 // indirect + github.com/klauspost/compress v1.18.0 // indirect + github.com/klauspost/cpuid/v2 v2.3.0 // indirect + github.com/lib/pq v1.10.9 // indirect + github.com/mailru/easyjson v0.9.0 // indirect + github.com/mattn/go-colorable v0.1.14 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect + github.com/mattn/go-runewidth v0.0.16 // indirect + github.com/mattn/go-shellwords v1.0.12 // indirect + github.com/mattn/go-sqlite3 v1.14.32 // indirect + github.com/microcosm-cc/bluemonday v1.0.27 // indirect + github.com/microsoft/go-mssqldb v1.9.3 // indirect + github.com/minio/crc64nvme v1.1.1 // indirect + github.com/minio/md5-simd v1.1.2 // indirect + github.com/minio/minio-go/v7 v7.0.95 // indirect + github.com/mitchellh/mapstructure v1.5.0 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/mschoch/smat v0.2.0 // indirect + github.com/nektos/act v0.2.63 // indirect + github.com/nxadm/tail v1.4.11 // indirect + github.com/olivere/elastic/v7 v7.0.32 // indirect + github.com/opencontainers/go-digest v1.0.0 // indirect + github.com/opencontainers/image-spec v1.1.1 // indirect + github.com/philhofer/fwd v1.2.0 // indirect + github.com/pjbgf/sha1cd v0.4.0 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/pquerna/otp v1.5.0 // indirect + github.com/redis/go-redis/v9 v9.12.1 // indirect + github.com/rhysd/actionlint v1.7.7 // indirect + github.com/rivo/uniseg v0.4.7 // indirect + github.com/robfig/cron/v3 v3.0.1 // indirect + github.com/rs/xid v1.6.0 // indirect + github.com/sassoftware/go-rpmutils v0.4.0 // indirect + github.com/sergi/go-diff v1.4.0 // indirect + github.com/sirupsen/logrus v1.9.3 // indirect + github.com/skeema/knownhosts v1.3.1 // indirect + github.com/syndtr/goleveldb v1.0.0 // indirect + github.com/tinylib/msgp v1.4.0 // indirect + github.com/ulikunitz/xz v0.5.15 // indirect + github.com/unknwon/com v1.0.1 // indirect + github.com/x448/float16 v0.8.4 // indirect + github.com/xanzy/ssh-agent v0.3.3 // indirect + github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect + github.com/yohcop/openid-go v1.0.1 // indirect + github.com/yuin/goldmark v1.7.13 // indirect + github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc // indirect + github.com/yuin/goldmark-meta v1.1.0 // indirect + go.etcd.io/bbolt v1.4.3 // indirect + go.uber.org/atomic v1.11.0 // indirect + go.uber.org/multierr v1.11.0 // indirect + go.uber.org/zap v1.27.0 // indirect + golang.org/x/crypto v0.45.0 // indirect + golang.org/x/image v0.30.0 // indirect + golang.org/x/mod v0.29.0 // indirect + golang.org/x/net v0.47.0 // indirect + golang.org/x/sync v0.18.0 // indirect + golang.org/x/sys v0.38.0 // indirect + golang.org/x/text v0.31.0 // indirect + google.golang.org/protobuf v1.36.8 // indirect + gopkg.in/ini.v1 v1.67.0 // indirect + gopkg.in/warnings.v0 v0.1.2 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect + mvdan.cc/xurls/v2 v2.6.0 // indirect + strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251 // indirect +) + +// Use local gitcaddy-server during development +replace code.gitea.io/gitea => ../gitcaddy-server + +// Same replacements as gitcaddy-server +replace github.com/jaytaylor/html2text => github.com/Necoro/html2text v0.0.0-20250804200300-7bf1ce1c7347 + +replace github.com/hashicorp/go-version => github.com/6543/go-version v1.3.1 + +replace github.com/nektos/act => gitea.com/gitea/act v0.261.7-0.20251003180512-ac6e4b751763 + +replace git.sr.ht/~mariusor/go-xsd-duration => gitea.com/gitea/go-xsd-duration v0.0.0-20220703122237-02e73435a078 + +// Use GitCaddy fork with capability support +replace code.gitea.io/actions-proto-go => git.marketally.com/gitcaddy/actions-proto-go v0.5.8 diff --git a/go.sum b/go.sum index bcaced5..a393b76 100644 --- a/go.sum +++ b/go.sum @@ -12,6 +12,8 @@ filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= git.marketally.com/gitcaddy/actions-proto-go v0.5.8 h1:MBipeHvY6A0jcobvziUtzgatZTrV4fs/HE1rPQxREN4= git.marketally.com/gitcaddy/actions-proto-go v0.5.8/go.mod h1:RPu21UoRD3zSAujoZR6LJwuVNa2uFRBveadslczCRfQ= +git.marketally.com/gitcaddy/gitcaddy-server v0.0.0-20260117082129-61f2cbe2eb26 h1:IRml77bkKqVSlan4TGoN2t+O0u+8PUppbOP/DKoD6y4= +git.marketally.com/gitcaddy/gitcaddy-server v0.0.0-20260117082129-61f2cbe2eb26/go.mod h1:RDUnzHYVP97TjU1t0+LMoC7JNoW0hCOrr4LAgxpaMIU= gitea.com/gitea/act v0.261.7-0.20251003180512-ac6e4b751763 h1:ohdxegvslDEllZmRNDqpKun6L4Oq81jNdEDtGgHEV2c= gitea.com/gitea/act v0.261.7-0.20251003180512-ac6e4b751763/go.mod h1:Pg5C9kQY1CEA3QjthjhlrqOC/QOT5NyWNjOjRHw23Ok= gitea.com/gitea/go-xsd-duration v0.0.0-20220703122237-02e73435a078 h1:BAFmdZpRW7zMQZQDClaCWobRj9uL1MR3MzpCVJvc5s4=