Merge branch '2.0.x' into #5974/restart_action_doesnt_run_session_start

Author: joejuzl

.github/workflows/continous-integration.yml

@@ -99,9 +99,13 @@ jobs:
     - name: Checkout target branch to be able to diff
       if: github.event_name == 'pull_request'
       run: |
-        git fetch --depth=1 origin ${{ github.base_ref }}
+        git fetch origin ${{ github.base_ref }}
         echo "DOCSTRING_DIFF_BRANCH=origin/${{ github.base_ref }}" >> $GITHUB_ENV
 
+        # Fetch entire history for current branch so that `make lint-docstrings`
+        # can calculate the proper diff between the branches
+        git pull --ff-only --unshallow origin ${{ github.head_ref }}
+
     - name: Lint Code 🎎
       run: |
         # If it's not a pull request, $DOCSTRING_DIFF_BRANCH is unset.

Makefile

@@ -66,14 +66,16 @@ lint:
 	poetry run black --check rasa tests
 	make lint-docstrings
 
-BRANCH ?= master # Compare against `master` if no branch was provided
+# Compare against `master` if no branch was provided
+BRANCH ?= master
 lint-docstrings:
-	# Lint docstrings only against the the diff to avoid too many errors.
-	# Check only production code. Ignore other flake errors which are captured by `lint`
-	# Diff of committed changes (shows only changes introduced by your branch)
-	if [[ -n "$(BRANCH)" ]]; then \
-	    git diff $(BRANCH)...HEAD -- rasa | poetry run flake8 --select D --diff; \
-	fi
+# Lint docstrings only against the the diff to avoid too many errors.
+# Check only production code. Ignore other flake errors which are captured by `lint`
+# Diff of committed changes (shows only changes introduced by your branch
+ifneq ($(strip $(BRANCH)),)
+	git diff $(BRANCH)...HEAD -- rasa | poetry run flake8 --select D --diff
+endif
+
 	# Diff of uncommitted changes for running locally
 	git diff HEAD -- rasa | poetry run flake8 --select D --diff