Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: upgrade to Caddy 2.9 #153

Merged
merged 2 commits into from
Jan 8, 2025
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
76 changes: 0 additions & 76 deletions .github/CODE_OF_CONDUCT.md

This file was deleted.

1 change: 0 additions & 1 deletion .github/FUNDING.yml

This file was deleted.

8 changes: 4 additions & 4 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ jobs:
fetch-depth: 0

- name: Install Go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: '1.21'
go-version: '1.23'
cache-dependency-path: |
go.sum
caddy/go.sum

- name: Login to Docker Hub
uses: docker/login-action@v2
uses: docker/login-action@v3
if: startsWith(github.ref, 'refs/tags/v')
with:
username: ${{ secrets.DOCKER_USERNAME }}
Expand All @@ -43,7 +43,7 @@ jobs:
echo "GORELEASER_PREVIOUS_TAG=$(awk 'NR==2 {print;exit}' <<< "$tags")" >> "$GITHUB_ENV"

- name: Run GoReleaser
uses: goreleaser/goreleaser-action@v5
uses: goreleaser/goreleaser-action@v6
with:
version: latest
args: release --clean ${{ !startsWith(github.ref, 'refs/tags/v') && '--snapshot --skip=sign' || '' }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: '1.21'
go-version: '1.23'
cache-dependency-path: |
go.sum
caddy/go.sum

- name: golangci-lint
uses: golangci/golangci-lint-action@v3
uses: golangci/golangci-lint-action@v6
with:
version: latest

Expand All @@ -34,9 +34,9 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: '1.21'
go-version: '1.23'
cache-dependency-path: |
go.sum
caddy/go.sum
Expand All @@ -50,7 +50,7 @@ jobs:

- name: Test Caddy module
run: |
go test -race -covermode atomic -coverprofile=cover.out -coverpkg=github.com/dunglas/vulcain
go test -tags=nobadger,nomysql,nopgx -race -covermode atomic -coverprofile=cover.out -coverpkg=github.com/dunglas/vulcain
sed '1d' cover.out >> ../cover.out
working-directory: ./caddy

Expand Down
18 changes: 8 additions & 10 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,27 @@
version: 2
before:
hooks:
- go mod tidy
checksum:
name_template: 'checksums.txt'
snapshot:
name_template: "{{ .Tag }}-next"
version_template: "{{ incpatch .Version }}-next"
changelog:
sort: asc
filters:
exclude:
- "^docs:"
- "^test:"
- "^ci:"
- "^build:"
- "^chore:"
- "^Merge"
use: github-native
release:
prerelease: auto
draft: true
env:
- CGO_ENABLED=0
builds:
- id: caddy
dir: caddy/vulcain
ldflags:
- -X 'github.com/caddyserver/caddy/v2.CustomVersion=Vulcain.rocks {{ .Version }} Caddy'
tags:
- nobadger
- nomysql
- nopgx
goos:
- linux
- darwin
Expand Down
Loading
Loading