Skip to content

Commit

Permalink
update lint workflow, dependancies, and how to install xcaddy
Browse files Browse the repository at this point in the history
  • Loading branch information
rayjlinden committed May 31, 2023
1 parent 66596f0 commit af3e771
Show file tree
Hide file tree
Showing 6 changed files with 1,294 additions and 24 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,13 @@ jobs:
name: lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-go@v4
with:
go-version: '1.17'
cache: false
- uses: actions/checkout@v3
- name: golangci-lint
uses: golangci/golangci-lint-action@v2
uses: golangci/golangci-lint-action@v3
with:
# Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
version: v1.29
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export AWS_ENDPOINT=http://localhost:4566
build: caddy

caddy: *.go go.mod Makefile
# go get -u github.com/caddyserver/xcaddy/cmd/xcaddy -- install xcaddy if you don't have it
# go install github.com/caddyserver/xcaddy/cmd/xcaddy@latest -- install xcaddy if you don't have it
xcaddy build --output caddy --with github.com/lindenlab/caddy-s3-proxy=${CURDIR}

.PHONY: docker
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ is not configured on your bucket.
With caddy 2 you can use [xcaddy](https://github.com/caddyserver/xcaddy) to build a version of caddy
with this plugin installed. To install xcaddy do:
```
go get -u github.com/caddyserver/xcaddy/cmd/xcaddy
go install github.com/caddyserver/xcaddy/cmd/xcaddy@latest
```

This repo has a Makefile to make it easier to build a new version of caddy with this plugin. Just type:
Expand Down
2 changes: 1 addition & 1 deletion Version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.5.6
0.5.7
22 changes: 13 additions & 9 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,19 @@ module github.com/lindenlab/caddy-s3-proxy
go 1.13

require (
cloud.google.com/go v0.54.0 // indirect
github.com/aws/aws-sdk-go v1.36.23
github.com/caddyserver/caddy/v2 v2.3.0
github.com/dustin/go-humanize v1.0.1-0.20200219035652-afde56e7acac
github.com/alecthomas/chroma v0.8.2 // indirect
github.com/antlr/antlr4 v0.0.0-20200503195918-621b933c7a7f // indirect
github.com/aws/aws-sdk-go v1.44.272
github.com/caddyserver/caddy/v2 v2.6.4
github.com/dustin/go-humanize v1.0.1
github.com/google/cel-spec v0.4.0 // indirect
github.com/jsternberg/zap-logfmt v1.2.0 // indirect
github.com/klauspost/cpuid v1.3.1 // indirect
github.com/miekg/dns v1.1.35 // indirect
github.com/lucas-clemente/quic-go v0.19.3 // indirect
github.com/naoina/go-stringutil v0.1.0 // indirect
github.com/naoina/toml v0.1.1 // indirect
github.com/smallstep/cli v0.15.2 // indirect
github.com/yuin/goldmark-highlighting v0.0.0-20200307114337-60d527fdb691 // indirect
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.16.0
golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 // indirect
google.golang.org/protobuf v1.25.0 // indirect
howett.net/plist v0.0.0-20200419221736-3b63eb3a43b5 // indirect
go.uber.org/zap v1.24.0
)
Loading

0 comments on commit af3e771

Please sign in to comment.