diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-11-02 10:53:22 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-11-02 10:53:23 +0300 |
| commit | 0510d06b56dfe25376cc9e9ee10b565241931f8d (patch) | |
| tree | 1622958c5df73a4ace033dd761fd4fe53a6fb469 /.github | |
| parent | 1a3712f06b5ad1f1cf5ae243c3ab15c5db762ac3 (diff) | |
| parent | edf80d23f1e945646a873dc9a4fa6634dd9e8ae8 (diff) | |
Merge branch 'jk/ci-retire-allow-ref' into maint-2.42
CI update.
* jk/ci-retire-allow-ref:
ci: deprecate ci/config/allow-ref script
ci: allow branch selection through "vars"
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/main.yml | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1b41278a7f..dcf7d78f1d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -21,6 +21,7 @@ concurrency: jobs: ci-config: name: config + if: vars.CI_BRANCHES == '' || contains(vars.CI_BRANCHES, github.ref_name) runs-on: ubuntu-latest outputs: enabled: ${{ steps.check-ref.outputs.enabled }}${{ steps.skip-if-redundant.outputs.enabled }} @@ -43,10 +44,13 @@ jobs: name: check whether CI is enabled for ref run: | enabled=yes - if test -x config-repo/ci/config/allow-ref && - ! config-repo/ci/config/allow-ref '${{ github.ref }}' + if test -x config-repo/ci/config/allow-ref then - enabled=no + echo "::warning::ci/config/allow-ref is deprecated; use CI_BRANCHES instead" + if ! config-repo/ci/config/allow-ref '${{ github.ref }}' + then + enabled=no + fi fi skip_concurrent=yes |