Merge branch 'enforce-changelog' into 'master'

Verify changelog file presence in CI NO CHANGELOG

Closes #273

See merge request gitlab-org/gitlab-workhorse!580

.gitlab-ci.yml

@@ -22,6 +22,12 @@ verify:
   script:
   - make verify
 
+changelog:
+  script:
+  - _support/check_changelog.sh
+  rules:
+  - if: '$CI_MERGE_REQUEST_IID'
+
 .test:
   services:
     - name: registry.gitlab.com/gitlab-org/build/cng/gitaly:latest

_support/check_changelog.sh

+#!/bin/sh
+
+set -e
+
+# we skip the changelog check if the merge requet title ends with "NO CHANGELOG"
+if echo "$CI_MERGE_REQUEST_TITLE" | grep -q ' NO CHANGELOG$'; then
+    echo "Changelog not needed"
+
+    exit 0
+fi
+
+target=${CI_MERGE_REQUEST_TARGET_BRANCH_NAME:-master}
+
+if git diff --name-only "origin/$target" | grep -q '^changelogs/' ; then
+    echo "Changelog included"
+else
+    echo "Please add a changelog running '_support/changelog'"
+    echo "or disable this check adding 'NO CHANGELOG' at the end of the merge request title"
+    echo "/title $CI_MERGE_REQUEST_TITLE NO CHANGELOG"
+
+    exit 1
+fi