Skip to content
Snippets Groups Projects
Commit 875bae16 authored by Grzegorz Bizon's avatar Grzegorz Bizon
Browse files

Merge branch 'allow-to-use-glob-for-ci-changes-detection' into 'master'

Add glob for CI changes detection

See merge request gitlab-org/gitlab-ce!23128
parents 85ec04ea 9bea3c0f
No related branches found
No related tags found
No related merge requests found
---
title: Added glob for CI changes detection
merge_request: 23128
author: Kirill Zaitsev
type: added
Loading
Loading
@@ -476,6 +476,7 @@ docker build:
- Dockerfile
- docker/scripts/*
- dockerfiles/**/*
- more_scripts/*.{rb,py,sh}
```
 
In the scenario above, if you are pushing multiple commits to GitLab to an
Loading
Loading
@@ -485,6 +486,7 @@ one of the commits contains changes to either:
- The `Dockerfile` file.
- Any of the files inside `docker/scripts/` directory.
- Any of the files and subfolders inside `dockerfiles` directory.
- Any of the files with `rb`, `py`, `sh` extensions inside `more_scripts` directory.
 
CAUTION: **Warning:**
There are some caveats when using this feature with new branches and tags. See
Loading
Loading
Loading
Loading
@@ -14,7 +14,7 @@ module Gitlab
 
pipeline.modified_paths.any? do |path|
@globs.any? do |glob|
File.fnmatch?(glob, path, File::FNM_PATHNAME | File::FNM_DOTMATCH)
File.fnmatch?(glob, path, File::FNM_PATHNAME | File::FNM_DOTMATCH | File::FNM_EXTGLOB)
end
end
end
Loading
Loading
Loading
Loading
@@ -49,6 +49,12 @@ describe Gitlab::Ci::Build::Policy::Changes do
expect(policy).to be_satisfied_by(pipeline, seed)
end
 
it 'is satisfied by matching a pattern with a glob' do
policy = described_class.new(%w[some/**/*.{rb,txt}])
expect(policy).to be_satisfied_by(pipeline, seed)
end
it 'is not satisfied when pattern does not match path' do
policy = described_class.new(%w[some/*.rb])
 
Loading
Loading
@@ -61,6 +67,12 @@ describe Gitlab::Ci::Build::Policy::Changes do
expect(policy).not_to be_satisfied_by(pipeline, seed)
end
 
it 'is not satified when pattern with glob does not match' do
policy = described_class.new(%w[invalid/*.{md,rake}])
expect(policy).not_to be_satisfied_by(pipeline, seed)
end
context 'when pipelines does not run for a branch update' do
before do
pipeline.before_sha = Gitlab::Git::BLANK_SHA
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment