diff --git a/ssf/config/formulas.sls b/ssf/config/formulas.sls index 16ade30a..53353d07 100644 --- a/ssf/config/formulas.sls +++ b/ssf/config/formulas.sls @@ -75,8 +75,10 @@ prepare-git-branch-for-{{ formula }}: {%- set add_or_rm = ['add', 'add', 'managed'] %} {#- Remove files if the file is `.cirrus.yml` and `use_cirrus_ci` is `False` #} {#- Likewise, if running the state for TOFS files when `use_tofs` is `False` #} +{#- Also remove the local issues templates to use the org-level templates instead #} {%- if (semrel_file == '.cirrus.yml' and not use_cirrus_ci) or - (semrel_file in ['docs/TOFS_pattern.rst', 'formula/libtofs.jinja'] and not use_tofs) + (semrel_file in ['docs/TOFS_pattern.rst', 'formula/libtofs.jinja'] and not use_tofs) or + (semrel_file.startswith('.github/ISSUE_TEMPLATE/')) %} {%- set add_or_rm = ['rm', 'remove', 'absent'] %} {%- endif %} diff --git a/ssf/defaults.yaml b/ssf/defaults.yaml index ecdb9ce7..9e2dab36 100644 --- a/ssf/defaults.yaml +++ b/ssf/defaults.yaml @@ -22,8 +22,8 @@ ssf_node_anchors: # An alternative method could be to use: # `git describe --abbrev=0 --tags` # yamllint disable rule:line-length - title: 'ci: merge travis matrix, add `salt-lint` & `rubocop` to `lint` job' - body: '* Automated using https://github.com/myii/ssf-formula/pull/60' + title: 'chore(issues): remove issues templates to use org-level templates [skip ci]' + body: '* Automated using https://github.com/myii/ssf-formula/pull/61' # yamllint enable rule:line-length github: owner: saltstack-formulas