Skip to content

Commit

Permalink
fix: CI: correct branch-off point for gitlint
Browse files Browse the repository at this point in the history
* Changed branch-off point for gitlinting from `dev` to `origin/dev`
* Since GitLab uses the git checkout policy for the CI runners the
entire Zephyr history was checked, whereas now it is indeed only the new
feature branch which gets checked back to its branch-off point from the
dev branch.

Closes zephyrproject-rtos#26

Signed-Off-By: Alexander Preißner <alexander.preissner@blik.io>
  • Loading branch information
Alexander Preißner committed Jul 9, 2018
1 parent a750ca1 commit c424c0e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ before_script:
# If no `.gitlint` file is present, a default set of rules is applied.
gitlint:
script:
- gitlint --commits "$(git merge-base --fork-point dev)..."
- gitlint --commits "$(git merge-base --fork-point origin/dev)..."

# Codestyle parsing
# This uses Zephyr's own checkpatch script to check against the diff down to the
Expand Down

0 comments on commit c424c0e

Please sign in to comment.