From d35e5be0038223b76b017a748678328105612555 Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Wed, 18 Dec 2024 23:29:14 +0800 Subject: [PATCH] 2.9.0-beta.3 --- .github/workflows/daily.yml | 4 ++-- .github/workflows/dev.yml | 5 +++-- .github/workflows/release.yaml | 4 ++-- DEV-VERSION | 2 +- README.md | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index a16a6ce..cb46575 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -46,7 +46,7 @@ jobs: GOOS: ${{ matrix.goos }} GOARCH: ${{ matrix.goarch }} run: | - xcaddy build --with github.com/caddyserver/cache-handler --with github.com/ueffel/caddy-brotli --with github.com/caddyserver/transform-encoder --with github.com/RussellLuo/caddy-ext/ratelimit --with github.com/caddy-dns/cloudflare + xcaddy build master --with github.com/caddyserver/cache-handler --with github.com/ueffel/caddy-brotli --with github.com/caddyserver/transform-encoder --with github.com/WJQSERVER/caddy-ext/ratelimit@2412182247 --with github.com/caddy-dns/cloudflare mkdir -p caddy-package mkdir -p caddy-package/LICENSE mv caddy caddy-package/ @@ -59,7 +59,7 @@ jobs: GOOS: ${{ matrix.goos }} GOARCH: ${{ matrix.goarch }} run: | - xcaddy build --with github.com/caddyserver/cache-handler --with github.com/ueffel/caddy-brotli --with github.com/caddyserver/transform-encoder --with github.com/RussellLuo/caddy-ext/ratelimit --with github.com/caddy-dns/cloudflare --with github.com/mholt/caddy-l4 + xcaddy build master --with github.com/caddyserver/cache-handler --with github.com/ueffel/caddy-brotli --with github.com/caddyserver/transform-encoder --with github.com/WJQSERVER/caddy-ext/ratelimit@2412182247 --with github.com/caddy-dns/cloudflare --with github.com/mholt/caddy-l4 mkdir -p caddy-package mkdir -p caddy-package/LICENSE mv caddy caddy-package/ diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 5f76b9e..c29043f 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -13,6 +13,7 @@ jobs: runs-on: ubuntu-latest env: GO_VERSION: 1.23.4 + CADDY_VERSION: v2.9.0-beta.3 strategy: matrix: goos: [linux, darwin] @@ -48,7 +49,7 @@ jobs: GOOS: ${{ matrix.goos }} GOARCH: ${{ matrix.goarch }} run: | - xcaddy build --with github.com/caddyserver/cache-handler --with github.com/ueffel/caddy-brotli --with github.com/caddyserver/transform-encoder --with github.com/RussellLuo/caddy-ext/ratelimit --with github.com/caddy-dns/cloudflare + xcaddy build ${{ env.CADDY_VERSION }} --with github.com/caddyserver/cache-handler --with github.com/ueffel/caddy-brotli --with github.com/caddyserver/transform-encoder --with github.com/WJQSERVER/caddy-ext/ratelimit@2412182247 --with github.com/caddy-dns/cloudflare tar -czvf caddy-${{ matrix.goos }}-${{ matrix.goarch }}.tar.gz caddy tar -I 'zstd -15' -cf caddy-${{ matrix.goos }}-${{ matrix.goarch }}.tar.zst caddy @@ -57,7 +58,7 @@ jobs: GOOS: ${{ matrix.goos }} GOARCH: ${{ matrix.goarch }} run: | - xcaddy build --with github.com/caddyserver/cache-handler --with github.com/ueffel/caddy-brotli --with github.com/caddyserver/transform-encoder --with github.com/RussellLuo/caddy-ext/ratelimit --with github.com/caddy-dns/cloudflare --with github.com/mholt/caddy-l4 + xcaddy build ${{ env.CADDY_VERSION }} --with github.com/caddyserver/cache-handler --with github.com/ueffel/caddy-brotli --with github.com/caddyserver/transform-encoder --with github.com/WJQSERVER/caddy-ext/ratelimit@2412182247 --with github.com/caddy-dns/cloudflare --with github.com/mholt/caddy-l4 tar -czvf caddy-${{ matrix.goos }}-${{ matrix.goarch }}-l4.tar.gz caddy tar -I 'zstd -15' -cf caddy-${{ matrix.goos }}-${{ matrix.goarch }}-l4.tar.zst caddy diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 5b2b79c..e4f1ab7 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -48,7 +48,7 @@ jobs: GOOS: ${{ matrix.goos }} GOARCH: ${{ matrix.goarch }} run: | - xcaddy build --with github.com/caddyserver/cache-handler --with github.com/ueffel/caddy-brotli --with github.com/caddyserver/transform-encoder --with github.com/RussellLuo/caddy-ext/ratelimit --with github.com/caddy-dns/cloudflare + xcaddy build --with github.com/caddyserver/cache-handler --with github.com/ueffel/caddy-brotli --with github.com/caddyserver/transform-encoder --with github.com/WJQSERVER/caddy-ext/ratelimit@2412182247 --with github.com/caddy-dns/cloudflare tar -czvf caddy-${{ matrix.goos }}-${{ matrix.goarch }}.tar.gz caddy tar -I 'zstd -15' -cf caddy-${{ matrix.goos }}-${{ matrix.goarch }}.tar.zst caddy @@ -57,7 +57,7 @@ jobs: GOOS: ${{ matrix.goos }} GOARCH: ${{ matrix.goarch }} run: | - xcaddy build --with github.com/caddyserver/cache-handler --with github.com/ueffel/caddy-brotli --with github.com/caddyserver/transform-encoder --with github.com/RussellLuo/caddy-ext/ratelimit --with github.com/caddy-dns/cloudflare --with github.com/mholt/caddy-l4 + xcaddy build --with github.com/caddyserver/cache-handler --with github.com/ueffel/caddy-brotli --with github.com/caddyserver/transform-encoder --with github.com/WJQSERVER/caddy-ext/ratelimit@2412182247 --with github.com/caddy-dns/cloudflare --with github.com/mholt/caddy-l4 tar -czvf caddy-${{ matrix.goos }}-${{ matrix.goarch }}-l4.tar.gz caddy tar -I 'zstd -15' -cf caddy-${{ matrix.goos }}-${{ matrix.goarch }}-l4.tar.zst caddy diff --git a/DEV-VERSION b/DEV-VERSION index 1303a4b..21d0f51 100644 --- a/DEV-VERSION +++ b/DEV-VERSION @@ -1 +1 @@ -2.9.0-rc7 +2.9.0-beta.3 diff --git a/README.md b/README.md index 5a5d776..8f39d90 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ - github.com/caddyserver/cache-handler - github.com/ueffel/caddy-brotli - github.com/caddyserver/transform-encoder - - github.com/RussellLuo/caddy-ext/ratelimit + - github.com/WJQSERVER/caddy-ext/ratelimit@2412182247(forked from github.com/RussellLuo/caddy-ext/ratelimit) - github.com/caddy-dns/cloudflare - github.com/mholt/caddy-l4(仅在L4固件内包含)