summaryrefslogtreecommitdiffhomepage
path: root/.github
diff options
context:
space:
mode:
authorFrancis Lavoie <[email protected]>2021-05-12 00:26:16 -0400
committerGitHub <[email protected]>2021-05-12 00:26:16 -0400
commit37718560c1bf8e330d18edb2e663e64a624dee8e (patch)
tree3f0ee7b78e83bb8140eca34faf8499462114d94d /.github
parent2aefe156869851a89d7a34e28c3e4ff3ac442fff (diff)
downloadcaddy-37718560c1bf8e330d18edb2e663e64a624dee8e.tar.gz
caddy-37718560c1bf8e330d18edb2e663e64a624dee8e.zip
ci: Run CI on PRs targeting minor version branches (#4164)
We decided that we'll use branches like `2.4` as the target for any changes that we might want to release in a `2.4.x` version like `2.4.1`, so that we can continue to merge changes targeting the next minor release (e.g. `2.5.0`) on master. Our CI config wasn't set up for this to work properly though, since it was only running checks on PRs targeting master. This should fix it. I couldn't find a way to do a pattern to only match digits for the branch names from Github's docs, it just looks like a pretty generic glob syntax. But this should do until we get to 3.0
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/ci.yml2
-rw-r--r--.github/workflows/cross-build.yml2
-rw-r--r--.github/workflows/lint.yml2
3 files changed, 6 insertions, 0 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 22e7d7ea5..9a46b80b3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,9 +6,11 @@ on:
push:
branches:
- master
+ - 2.*
pull_request:
branches:
- master
+ - 2.*
jobs:
test:
diff --git a/.github/workflows/cross-build.yml b/.github/workflows/cross-build.yml
index 4da0a2570..dc6b8e3d9 100644
--- a/.github/workflows/cross-build.yml
+++ b/.github/workflows/cross-build.yml
@@ -4,9 +4,11 @@ on:
push:
branches:
- master
+ - 2.*
pull_request:
branches:
- master
+ - 2.*
jobs:
cross-build-test:
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index ef6915055..4b4ed036b 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -4,9 +4,11 @@ on:
push:
branches:
- master
+ - 2.*
pull_request:
branches:
- master
+ - 2.*
jobs:
# From https://github.com/golangci/golangci-lint-action