Merge pull request #70 from myii/feat/remove-contributing

feat(contributing): remove from all `semrel_formulas`
myii · Oct 14, 2019 · 93ebd08 · 93ebd08
2 parents 1e46502 + 96f09d4
commit 93ebd08
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git 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 `CONTRIBUTING` file to use the org-level file 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 in ['docs/CONTRIBUTING.rst'])
 %}
 {%-             set add_or_rm = ['rm', 'remove', 'absent'] %}
 {%-           endif %}

diff --git a/ssf/defaults.yaml b/ssf/defaults.yaml
@@ -14,16 +14,16 @@ ssf_node_anchors:
           branch:
             # TODO: `base` can be removed in favour of `github:remote:upstream:branch`
             base: master
-            pr: chore/standardise-structure
+            pr: chore/70
             upstream: upstream
           commit:
             # NOTE: The version number in the `body` is automatically updated during the
             #       release phase via. `pre-commit_semantic-release.sh`
             #       An alternative method could be to use:
             #       `git describe --abbrev=0 --tags`
             # yamllint disable rule:line-length
-            title: 'refactor(tofs): upgrade for all file.managed'
-            body: '* Semi-automated using https://github.com/myii/ssf-formula/pull/68'
+            title: 'docs(contributing): remove to use org-level file instead [skip ci]'
+            body: '* Automated using https://github.com/myii/ssf-formula/pull/70'
             # yamllint enable rule:line-length
           github:
             owner: saltstack-formulas