Merge pull request #95 from saltstack-formulas/renovate/https-github.com-dafyddj-copier-ssf-ci-2.x

chore(copier): update template https://github.com/dafyddj/copier-ssf-ci to v2.7.1

Author: dafyddj

.copier-answers.ssf-ci.yml

@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
-_commit: v2.7.0
+_commit: v2.7.1
 _src_path: https://github.com/dafyddj/copier-ssf-ci
 failure_permitted_ignored: []
 failure_permitted_patterns: []

.github/workflows/main.yml

@@ -27,7 +27,7 @@ jobs:
     if: fromJSON(needs.should-run.outputs.should-run)
     container: techneg/ci-pre-commit:v2.4.32@sha256:fa9eef397583add95f4fccefa6ecbbf7a3845d6168f07393da7bc619696b246b
     runs-on: ubuntu-latest
-    timeout-minutes: 5
+    timeout-minutes: 10
     steps:
       - run: | # Needed because of bug #2031 in `actions/checkout`
           git config --global --add safe.directory "$GITHUB_WORKSPACE"

.gitlab-ci.yml

@@ -94,15 +94,6 @@ commitlint:
     # 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}"

pre-commit_semantic-release.sh

@@ -11,7 +11,8 @@ sed -i -e "s_^\(version:\).*_\1 ${1}_" FORMULA
 # (B) Update `AUTHORS.md`
 ###############################################################################
 
-maintainer contributor --ignore-contributors semantic-release-bot,renovate[bot]
+maintainer contributor \
+  --ignore-contributors dependabot[bot],renovate[bot],semantic-release-bot
 
 ###############################################################################
 # (C) Use `m2r` to convert automatically produced `.md` docs to `.rst`