ci(gitlab-ci): reset after update hook for rubocop [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/290
This commit is contained in:
Imran Iqbal 2021-02-01 23:54:56 +00:00
parent 2c090c3a83
commit 6d40ab7634
No known key found for this signature in database
GPG Key ID: 6D8629439D2B7819

View File

@ -48,30 +48,30 @@ variables:
###############################################################################
# `lint` stage: `commitlint` & `pre-commit`
###############################################################################
# commitlint:
# stage: *stage_lint
# image: *image_commitlint
# script:
# # Add `upstream` remote to get access to `upstream/master`
# - 'git remote add upstream
# https://gitlab.com/saltstack-formulas/apache-formula.git'
# - 'git fetch --all'
# # Set default commit hashes for `--from` and `--to`
# - 'export COMMITLINT_FROM="$(git merge-base upstream/master HEAD)"'
# - 'export COMMITLINT_TO="${CI_COMMIT_SHA}"'
# # `coqbot` adds a merge commit to test PRs on top of the latest commit in
# # the repo; amend this merge commit message to avoid failure
# - |
# if [ "${GITLAB_USER_LOGIN}" = "coqbot" ] \
# && [ "${CI_COMMIT_BRANCH}" != "master" ]; then
# git commit --amend -m \
# 'chore: reword coqbot merge commit message for commitlint'
# export COMMITLINT_TO=HEAD
# fi
# # Run `commitlint`
# - 'commitlint --from "${COMMITLINT_FROM}"
# --to "${COMMITLINT_TO}"
# --verbose'
commitlint:
stage: *stage_lint
image: *image_commitlint
script:
# Add `upstream` remote to get access to `upstream/master`
- 'git remote add upstream
https://gitlab.com/saltstack-formulas/apache-formula.git'
- 'git fetch --all'
# Set default commit hashes for `--from` and `--to`
- 'export COMMITLINT_FROM="$(git merge-base upstream/master HEAD)"'
- 'export COMMITLINT_TO="${CI_COMMIT_SHA}"'
# `coqbot` adds a merge commit to test PRs on top of the latest commit in
# the repo; amend this merge commit message to avoid failure
- |
if [ "${GITLAB_USER_LOGIN}" = "coqbot" ] \
&& [ "${CI_COMMIT_BRANCH}" != "master" ]; then
git commit --amend -m \
'chore: reword coqbot merge commit message for commitlint'
export COMMITLINT_TO=HEAD
fi
# Run `commitlint`
- 'commitlint --from "${COMMITLINT_FROM}"
--to "${COMMITLINT_TO}"
--verbose'
pre-commit:
stage: *stage_lint
@ -123,6 +123,68 @@ rubocop:
## Define the rest of the matrix based on Kitchen testing
# Make sure the instances listed below match up with
# the `platforms` defined in `kitchen.yml`
# default-debian-10-master-py3: {extends: '.test_instance'}
modules-debian-10-master-py3: {extends: '.test_instance'}
# default-ubuntu-1804-master-py3: {extends: '.test_instance'}
# modules-ubuntu-1804-master-py3: {extends: '.test_instance'}
# default-centos-8-master-py3: {extends: '.test_instance'}
modules-centos-8-master-py3: {extends: '.test_instance'}
# default-fedora-31-master-py3: {extends: '.test_instance'}
modules-fedora-31-master-py3: {extends: '.test_instance'}
# default-opensuse-leap-151-master-py3: {extends: '.test_instance'}
modules-opensuse-leap-151-master-py3: {extends: '.test_instance'}
# https://community.letsencrypt.org/t/localhost-crt-does-not-exist-or-is-empty/103979
default-amazonlinux-2-master-py3: {extends: '.test_instance'}
# modules-amazonlinux-2-master-py3: {extends: '.test_instance'}
# default-debian-10-2019-2-py3: {extends: '.test_instance'}
# modules-debian-10-2019-2-py3: {extends: '.test_instance'}
# default-debian-9-2019-2-py3: {extends: '.test_instance'}
# modules-debian-9-2019-2-py3: {extends: '.test_instance'}
# default-ubuntu-1804-2019-2-py3: {extends: '.test_instance'}
modules-ubuntu-1804-2019-2-py3: {extends: '.test_instance'}
# default-centos-8-2019-2-py3: {extends: '.test_instance'}
# modules-centos-8-2019-2-py3: {extends: '.test_instance'}
# default-fedora-31-2019-2-py3: {extends: '.test_instance'}
# modules-fedora-31-2019-2-py3: {extends: '.test_instance'}
# default-opensuse-leap-151-2019-2-py3: {extends: '.test_instance'}
# modules-opensuse-leap-151-2019-2-py3: {extends: '.test_instance'}
# default-centos-7-2019-2-py2: {extends: '.test_instance'}
modules-centos-7-2019-2-py2: {extends: '.test_instance'}
# default-amazonlinux-2-2019-2-py3: {extends: '.test_instance'}
# modules-amazonlinux-2-2019-2-py3: {extends: '.test_instance'}
# default-arch-base-latest-2019-2-py2: {extends: '.test_instance'}
# modules-arch-base-latest-2019-2-py2: {extends: '.test_instance'}
# arch-arch-base-latest-2019-2-py2: {extends: '.test_instance'}
# default-fedora-30-2018-3-py3: {extends: '.test_instance'}
# modules-fedora-30-2018-3-py3: {extends: '.test_instance'}
# default-debian-9-2018-3-py2: {extends: '.test_instance'}
# modules-debian-9-2018-3-py2: {extends: '.test_instance'}
# default-ubuntu-1604-2018-3-py2: {extends: '.test_instance'}
# modules-ubuntu-1604-2018-3-py2: {extends: '.test_instance'}
# default-centos-7-2018-3-py2: {extends: '.test_instance'}
# modules-centos-7-2018-3-py2: {extends: '.test_instance'}
# default-opensuse-leap-151-2018-3-py2: {extends: '.test_instance'}
# modules-opensuse-leap-151-2018-3-py2: {extends: '.test_instance'}
# default-amazonlinux-1-2018-3-py2: {extends: '.test_instance'}
# modules-amazonlinux-1-2018-3-py2: {extends: '.test_instance'}
# default-arch-base-latest-2018-3-py2: {extends: '.test_instance'}
# modules-arch-base-latest-2018-3-py2: {extends: '.test_instance'}
# arch-arch-base-latest-2018-3-py2: {extends: '.test_instance'}
# default-debian-8-2017-7-py2: {extends: '.test_instance'}
# modules-debian-8-2017-7-py2: {extends: '.test_instance'}
# default-ubuntu-1604-2017-7-py2: {extends: '.test_instance'}
# modules-ubuntu-1604-2017-7-py2: {extends: '.test_instance'}
# default-centos-6-2017-7-py2: {extends: '.test_instance'}
# modules-centos-6-2017-7-py2: {extends: '.test_instance'}
# default-fedora-30-2017-7-py2: {extends: '.test_instance'}
# modules-fedora-30-2017-7-py2: {extends: '.test_instance'}
# default-opensuse-leap-151-2017-7-py2: {extends: '.test_instance'}
# modules-opensuse-leap-151-2017-7-py2: {extends: '.test_instance'}
# default-amazonlinux-1-2017-7-py2: {extends: '.test_instance'}
# modules-amazonlinux-1-2017-7-py2: {extends: '.test_instance'}
# default-arch-base-latest-2017-7-py2: {extends: '.test_instance'}
# modules-arch-base-latest-2017-7-py2: {extends: '.test_instance'}
arch-arch-base-latest-2017-7-py2: {extends: '.test_instance'}
###############################################################################
# `release` stage: `semantic-release`