Skip to content

Commit 21c82dc

Browse files
peffgitster
authored andcommitted
ci: allow branch selection through "vars"
When we added config to skip CI for certain branches in e76eec3 (ci: allow per-branch config for GitHub Actions, 2020-05-07), there wasn't any way to avoid spinning up a VM just to check the config. From the developer's perspective this isn't too bad, as the "skipped" branches complete successfully after running the config job (the workflow result is "success" instead of "skipped", but that is a minor lie). But we are still wasting time and GitHub's CPU to spin up a VM just to check the result of a short shell script. At the time there wasn't any way to avoid this. But they've since introduced repo-level variables that should let us do the same thing: https://github.blog/2023-01-10-introducing-required-workflows-and-configuration-variables-to-github-actions/#configuration-variables This is more efficient, and as a bonus is probably less confusing to configure (the existing system requires sticking your config on a magic ref). See the included docs for how to configure it. The code itself is pretty simple: it checks the variable and skips the config job if appropriate (and everything else depends on the config job already). There are two slight inaccuracies here: - we don't insist on branches, so this likewise applies to tag names or other refs. I think in practice this is OK, and keeping the code (and docs) short is more important than trying to be more exact. We are targeting developers of git.git and their limited workflows. - the match is done as a substring (so if you want to run CI for "foobar", then branch "foo" will accidentally match). Again, this should be OK in practice, as anybody who uses this is likely to only specify a handful of well-known names. If we want to be more exact, we can have the code check for adjoining spaces. Or even move to a more general CI_CONFIG variable formatted as JSON. I went with this scheme for the sake of simplicity. Signed-off-by: Jeff King <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 0d1bd1d commit 21c82dc

File tree

2 files changed

+15
-0
lines changed

2 files changed

+15
-0
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ env:
88
jobs:
99
ci-config:
1010
name: config
11+
if: vars.CI_BRANCHES == '' || contains(vars.CI_BRANCHES, github.ref_name)
1112
runs-on: ubuntu-latest
1213
outputs:
1314
enabled: ${{ steps.check-ref.outputs.enabled }}${{ steps.skip-if-redundant.outputs.enabled }}

ci/config/README

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
You can configure some aspects of the GitHub Actions-based CI on a
2+
per-repository basis by setting "variables" and "secrets" from with the
3+
GitHub web interface. These can be found at:
4+
5+
https://github.com/<user>/git/settings/secrets/actions
6+
7+
The following variables can be used:
8+
9+
- CI_BRANCHES
10+
11+
By default, CI is run when any branch is pushed. If this variable is
12+
non-empty, then only the branches it lists will run CI. Branch names
13+
should be separated by spaces, and should use their shortened form
14+
(e.g., "main", not "refs/heads/main").

0 commit comments

Comments
 (0)