diff options
| author | Matt Holt <[email protected]> | 2024-12-20 10:55:02 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-12-20 10:55:02 -0700 |
| commit | 86da4e8f56f3518bc053dd4f68a78c538a4aab5f (patch) | |
| tree | baaf259e90a81d56bf8a2999809d396a02fe1ea9 /.github | |
| parent | 130c868e95dfd1a8b1d39fd217bc6378f6b72ec0 (diff) | |
| parent | ed1c594cdbddf89829eaf1174f414028577b432d (diff) | |
| download | caddy-transfer-encoding-match.tar.gz caddy-transfer-encoding-match.zip | |
Merge branch 'master' into transfer-encoding-matchtransfer-encoding-match
Diffstat (limited to '.github')
| -rw-r--r-- | .github/SECURITY.md | 10 | ||||
| -rw-r--r-- | .github/workflows/ci.yml | 5 | ||||
| -rw-r--r-- | .github/workflows/cross-build.yml | 2 |
3 files changed, 9 insertions, 8 deletions
diff --git a/.github/SECURITY.md b/.github/SECURITY.md index 44cc5b7cd..557b4bac1 100644 --- a/.github/SECURITY.md +++ b/.github/SECURITY.md @@ -5,11 +5,11 @@ The Caddy project would like to make sure that it stays on top of all practicall ## Supported Versions -| Version | Supported | -| ------- | ------------------ | -| 2.x | ✔️ | -| 1.x | :x: | -| < 1.x | :x: | +| Version | Supported | +| -------- | ----------| +| 2.latest | ✔️ | +| 1.x | :x: | +| < 1.x | :x: | ## Acceptable Scope diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a88bd17a4..c16af8db5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -143,7 +143,7 @@ jobs: s390x-test: name: test (s390x on IBM Z) runs-on: ubuntu-latest - if: github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'dependabot[bot]' + if: github.event.pull_request.head.repo.full_name == 'caddyserver/caddy' && github.actor != 'dependabot[bot]' continue-on-error: true # August 2020: s390x VM is down due to weather and power issues steps: - name: Checkout code @@ -194,6 +194,7 @@ jobs: goreleaser-check: runs-on: ubuntu-latest + if: github.event.pull_request.head.repo.full_name == 'caddyserver/caddy' && github.actor != 'dependabot[bot]' steps: - name: Checkout code uses: actions/checkout@v4 @@ -216,4 +217,4 @@ jobs: version: latest args: build --single-target --snapshot env: - TAG: "master" + TAG: ${{ github.head_ref || github.ref_name }} diff --git a/.github/workflows/cross-build.yml b/.github/workflows/cross-build.yml index e77e4e992..af0394603 100644 --- a/.github/workflows/cross-build.yml +++ b/.github/workflows/cross-build.yml @@ -70,4 +70,4 @@ jobs: continue-on-error: true working-directory: ./cmd/caddy run: | - GOOS=$GOOS GOARCH=$GOARCH go build -tags nobadger -trimpath -o caddy-"$GOOS"-$GOARCH 2> /dev/null + GOOS=$GOOS GOARCH=$GOARCH go build -tags=nobadger,nomysql,nopgx -trimpath -o caddy-"$GOOS"-$GOARCH 2> /dev/null |