Skip to content

Commit 54730b2

Browse files
committed
chore(semantic-release): standardise structure
* Checked using myii/ssf-formula#150
1 parent 20d60d0 commit 54730b2

File tree

18 files changed

+128
-183
lines changed

18 files changed

+128
-183
lines changed

.rubocop.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,3 @@ Layout/LineLength:
88
Max: 88
99

1010
# Any offenses that should be fixed, e.g. collected via. `rubocop --auto-gen-config`
11-
# <REMOVEME
12-
Metrics/BlockLength:
13-
Max: 36
14-
# REMOVEME>

.travis.yml

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -58,56 +58,47 @@ jobs:
5858
## Define the rest of the matrix based on Kitchen testing
5959
# Make sure the instances listed below match up with
6060
# the `platforms` defined in `kitchen.yml`
61-
# NOTE: Please try to select up to six instances that add some meaningful
62-
# testing of the formula's behaviour. If possible, try to refrain from
63-
# the classical "chosing all the instances because I want to test on
64-
# another/all distro/s" trap: it will just add time to the testing (see
65-
# the discussion on #121). As an example, the set chosen below covers
66-
# the most used distros families, systemd and non-systemd and the latest
67-
# three supported Saltstack versions with python2 and 3.
68-
# As for `kitchen.yml`, that should still contain all of the platforms,
69-
# to allow for comprehensive local testing
70-
# Ref: https://github.com/saltstack-formulas/template-formula/issues/118
71-
# Ref: https://github.com/saltstack-formulas/template-formula/issues/121
72-
- env: INSTANCE=default-ubuntu-1804-master-py3
73-
- env: INSTANCE=source-ubuntu-1804-master-py3
74-
- env: INSTANCE=repo-ubuntu-1804-master-py3
7561
- env: INSTANCE=default-debian-10-master-py3
62+
# - env: INSTANCE=default-ubuntu-1804-master-py3
7663
- env: INSTANCE=default-centos-8-master-py3
77-
- env: INSTANCE=default-fedora-31-master-py3
78-
- env: INSTANCE=binary-opensuse-leap-151-master-py3
79-
- env: INSTANCE=binary-amazonlinux-2-master-py3
80-
- env: INSTANCE=binary-arch-base-latest-master-py2
64+
# - env: INSTANCE=default-fedora-31-master-py3
65+
# - env: INSTANCE=default-opensuse-leap-151-master-py3
66+
# - env: INSTANCE=default-amazonlinux-2-master-py3
67+
# - env: INSTANCE=default-arch-base-latest-master-py2
8168
# - env: INSTANCE=default-debian-10-3000-1-py3
82-
# - env: INSTANCE=default-ubuntu-1804-3000-1-py3
69+
- env: INSTANCE=default-ubuntu-1804-3000-1-py3
70+
- env: INSTANCE=source-ubuntu-1804-3000-1-py3
71+
- env: INSTANCE=repo-ubuntu-1804-3000-1-py3
8372
# - env: INSTANCE=default-centos-8-3000-1-py3
8473
# - env: INSTANCE=default-fedora-31-3000-1-py3
8574
# - env: INSTANCE=default-opensuse-leap-151-3000-1-py3
75+
- env: INSTANCE=binary-opensuse-leap-151-3000-1-py3
8676
# - env: INSTANCE=default-amazonlinux-2-3000-1-py3
77+
- env: INSTANCE=binary-amazonlinux-2-3000-1-py3
8778
# - env: INSTANCE=default-arch-base-latest-3000-1-py2
8879
# - env: INSTANCE=default-debian-10-2019-2-py3
8980
# - env: INSTANCE=default-debian-9-2019-2-py3
9081
# - env: INSTANCE=default-ubuntu-1804-2019-2-py3
9182
# - env: INSTANCE=default-ubuntu-1604-2019-2-py3
9283
# - env: INSTANCE=default-centos-8-2019-2-py3
9384
# - env: INSTANCE=default-centos-7-2019-2-py3
94-
# - env: INSTANCE=default-fedora-31-2019-2-py3
85+
- env: INSTANCE=default-fedora-31-2019-2-py3
9586
# - env: INSTANCE=default-opensuse-leap-151-2019-2-py3
9687
# - env: INSTANCE=default-amazonlinux-2-2019-2-py3
9788
# - env: INSTANCE=default-ubuntu-1804-2019-2-py2
9889
# - env: INSTANCE=default-amazonlinux-1-2019-2-py2
99-
# - env: INSTANCE=default-arch-base-latest-2019-2-py2
90+
# - env: INSTANCE=default-arch-base-latest-2019-2-py2
10091
# - env: INSTANCE=default-centos-7-2018-3-py3
10192
# - env: INSTANCE=default-fedora-30-2018-3-py3
10293
# - env: INSTANCE=default-debian-9-2018-3-py2
10394
# - env: INSTANCE=default-debian-8-2018-3-py2
10495
# - env: INSTANCE=default-ubuntu-1804-2018-3-py2
10596
# - env: INSTANCE=default-ubuntu-1604-2018-3-py2
106-
# - env: INSTANCE=centos6-centos-6-2018-3-py2
97+
# - env: INSTANCE=default-centos-6-2018-3-py2
10798
# - env: INSTANCE=default-opensuse-leap-151-2018-3-py2
10899
# - env: INSTANCE=default-amazonlinux-1-2018-3-py2
109100
# - env: INSTANCE=default-arch-base-latest-2018-3-py2
110-
# <REMOVEME
101+
- env: INSTANCE=binary-arch-base-latest-2018-3-py2
111102

112103
## Define the release stage that runs `semantic-release`
113104
- stage: 'release'

AUTHORS.md

Lines changed: 0 additions & 24 deletions
This file was deleted.

CHANGELOG.md

Whitespace-only changes.

FORMULA

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: node
2-
os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, Suse, openSUSE, Gentoo, Funtoo, Arch, Manjaro, Alpine, FreeBSD, OpenBSD, Solaris, SmartOS
3-
os_family: Debian, RedHat, Suse, Gentoo, Arch, Alpine, FreeBSD, OpenBSD, Solaris
4-
version: 0.4.0
2+
os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, Amazon, Suse, openSUSE, Gentoo, Funtoo, Arch, Manjaro, Alpine, FreeBSD, OpenBSD, Solaris, SmartOS, Windows, MacOS
3+
os_family: Debian, RedHat, Suse, Gentoo, Arch, Alpine, FreeBSD, OpenBSD, Solaris, Windows, MacOS
4+
version: 0.13.2
55
release: 1
66
minimum_version: 2016.11
77
summary: node formula

docs/AUTHORS.rst

Lines changed: 0 additions & 62 deletions
This file was deleted.

docs/CHANGELOG.rst

Whitespace-only changes.

docs/README.rst

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.. _readme:
22

33
node-formula
4-
===============
4+
============
55

66
|img_travis| |img_sr|
77

@@ -34,21 +34,29 @@ which contains the currently released version. This formula is versioned accordi
3434

3535
See `Formula Versioning Section <https://docs.saltstack.com/en/latest/topics/development/conventions/formulas.html#versioning>`_ for more details.
3636

37+
If you need (non-default) configuration, please pay attention to the ``pillar.example`` file and/or `Special notes`_ section.
38+
3739
Contributing to this repo
3840
-------------------------
3941

4042
**Commit message formatting is significant!!**
4143

4244
Please see `How to contribute <https://github.com/saltstack-formulas/.github/blob/master/CONTRIBUTING.rst>`_ for more details.
4345

46+
Special notes
47+
-------------
48+
49+
None.
50+
51+
4452
Available states
4553
----------------
4654

4755
.. contents::
4856
:local:
4957

5058
``node``
51-
^^^^^^^^^^^
59+
^^^^^^^^
5260

5361
*Meta-state (This is a state that includes other states)*.
5462

@@ -57,28 +65,28 @@ manages Node configuration file and then
5765
starts the associated node service.
5866

5967
``node.package``
60-
^^^^^^^^^^^^^^^^^^^
68+
^^^^^^^^^^^^^^^^
6169

6270
This state will install Node package only.
6371

6472
``node.binary``
65-
^^^^^^^^^^^^^^^^^^
73+
^^^^^^^^^^^^^^^
6674

6775
This state will install Node from binary only.
6876

6977
``node.source``
70-
^^^^^^^^^^^^^^^^^^
78+
^^^^^^^^^^^^^^^
7179

7280
This state will install Node from source only.
7381

7482
``node.config``
75-
^^^^^^^^^^^^^^^^^^
83+
^^^^^^^^^^^^^^^
7684

7785
This state will configure npmrc and/or environment and has a dependency on ``node.install``
7886
via include list.
7987

8088
``node.clean``
81-
^^^^^^^^^^^^^^^^^
89+
^^^^^^^^^^^^^^
8290

8391
*Meta-state (This is a state that includes other states)*.
8492

@@ -87,25 +95,25 @@ removes the configuration file and
8795
then uninstalls the package.
8896

8997
``node.config.clean``
90-
^^^^^^^^^^^^^^^^^^^^^^^^
98+
^^^^^^^^^^^^^^^^^^^^^
9199

92100
This state will remove the configuration of Node and has a
93101
dependency on ``node.package.clean`` via include list.
94102

95103
``node.package.clean``
96-
^^^^^^^^^^^^^^^^^^^^^^^^^
104+
^^^^^^^^^^^^^^^^^^^^^^
97105

98106
This state will remove Node package and has a dependency on
99107
``node.config.clean`` via include list.
100108

101109
``node.source.clean``
102-
^^^^^^^^^^^^^^^^^^^^^^^^
110+
^^^^^^^^^^^^^^^^^^^^^
103111

104112
This state will remove Node package and has a dependency on
105113
``node.config.clean`` via include list.
106114

107115
``node.binary.clean``
108-
^^^^^^^^^^^^^^^^^^^^^^^^
116+
^^^^^^^^^^^^^^^^^^^^^
109117

110118
This state will remove Node package and has a dependency on
111119
``node.config.clean`` via include list.

0 commit comments

Comments
 (0)