Skip to content

Commit

Permalink
fix(release.config.js): use full commit hash in commit link [skip ci]
Browse files Browse the repository at this point in the history
* Automated using #89
  • Loading branch information
myii committed Oct 31, 2019
1 parent d29e5cd commit f072717
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 15 deletions.
12 changes: 6 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
script:
# Install and run `salt-lint`
- pip install --user salt-lint
- git ls-files | grep '\.sls$\|\.jinja$\|\.j2$\|\.tmpl$'
- git ls-files | grep '\.sls$\|\.jinja$\|\.j2$\|\.tmpl$\|\.tst$'
| xargs -I {} salt-lint {}
# Install and run `yamllint`
# Need at least `v1.17.0` for the `yaml-files` setting
Expand All @@ -32,8 +32,8 @@ jobs:
- gem install rubocop
- rubocop -d
# Install and run `commitlint`
- npm install @commitlint/config-conventional -D
- npm install @commitlint/travis-cli -D
- npm i -D @commitlint/config-conventional
@commitlint/travis-cli
- commitlint-travis

## Define the release stage that runs `semantic-release`
Expand All @@ -50,9 +50,9 @@ jobs:
- maintainer contributor

# Install all dependencies required for `semantic-release`
- npm install @semantic-release/changelog@3 -D
- npm install @semantic-release/exec@3 -D
- npm install @semantic-release/git@7 -D
- npm i -D @semantic-release/changelog@3
@semantic-release/exec@3
@semantic-release/git@7
deploy:
provider: 'script'
skip_cleanup: true
Expand Down
7 changes: 0 additions & 7 deletions pre-commit_semantic-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,3 @@ sed -i -e '1,4s/-/=/g' CHANGELOG.rst

# Return back to the main directory
cd ..


###############################################################################
# (C) Update `ssf/defaults.yaml` with `${nextRelease.version}`
###############################################################################
V_REPR=v${1}
sed -i -e "s_^\(\s\+body: '\* Automated using \`ssf-formula\` (\).*\()'\)_\1${V_REPR}\2_" ssf/defaults.yaml
4 changes: 2 additions & 2 deletions release.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ module.exports = {
prepareCmd: 'sh ./pre-commit_semantic-release.sh ${nextRelease.version}',
}],
['@semantic-release/git', {
assets: ['*.md', 'docs/*.rst', 'FORMULA', 'ssf/defaults.yaml'],
assets: ['*.md', 'docs/*.rst', 'FORMULA'],
}],
'@semantic-release/github',
],
Expand Down Expand Up @@ -63,7 +63,7 @@ module.exports = {
}

if (typeof commit.hash === `string`) {
commit.hash = commit.hash.substring(0, 7)
commit.shortHash = commit.hash.substring(0, 7)
}

if (typeof commit.subject === `string`) {
Expand Down

0 comments on commit f072717

Please sign in to comment.