diff options
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/models/ci/pipeline.rb | 2 | ||||
| -rw-r--r-- | doc/ci/yaml/README.md | 4 | ||||
| -rw-r--r-- | spec/services/create_commit_builds_service_spec.rb | 15 |
4 files changed, 19 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG index d32c1fd8492..eb94f963982 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -11,6 +11,7 @@ v 8.10.0 (unreleased) - Fix changing issue state columns in milestone view - Fix user creation with stronger minimum password requirements !4054 (nathan-pmt) - Add API endpoint for a group issues !4520 (mahcsig) + - Allow [ci skip] to be in any case. !4785 (simon_w) v 8.9.1 - Fix merge requests project settings help link anchor diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb index 0c9a5e42eec..89434abca05 100644 --- a/app/models/ci/pipeline.rb +++ b/app/models/ci/pipeline.rb @@ -163,7 +163,7 @@ module Ci end def skip_ci? - git_commit_message =~ /(\[ci skip\])/ if git_commit_message + git_commit_message =~ /(\[ci skip\])/i if git_commit_message end def environments diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index 1892acda29b..ca3bf37f8ad 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -1034,8 +1034,8 @@ You can find the link under `/ci/lint` of your gitlab instance. ## Skipping builds -If your commit message contains `[ci skip]`, the commit will be created but the -builds will be skipped. +If your commit message contains `[ci skip]`, using any capitalization, the +commit will be created but the builds will be skipped. ## Examples diff --git a/spec/services/create_commit_builds_service_spec.rb b/spec/services/create_commit_builds_service_spec.rb index deab242f45a..2255945a1ad 100644 --- a/spec/services/create_commit_builds_service_spec.rb +++ b/spec/services/create_commit_builds_service_spec.rb @@ -83,6 +83,7 @@ describe CreateCommitBuildsService, services: true do context 'when commit contains a [ci skip] directive' do let(:message) { "some message[ci skip]" } + let(:capMessage) { "some message[CI SKIP]" } before do allow_any_instance_of(Ci::Pipeline).to receive(:git_commit_message) { message } @@ -101,6 +102,20 @@ describe CreateCommitBuildsService, services: true do expect(pipeline.status).to eq("skipped") end + it "skips builds creation if there is [CI SKIP] tag in commit message" do + commits = [{ message: capMessage }] + pipeline = service.execute(project, user, + ref: 'refs/tags/0_1', + before: '00000000', + after: '31das312', + commits: commits + ) + + expect(pipeline).to be_persisted + expect(pipeline.builds.any?).to be false + expect(pipeline.status).to eq("skipped") + end + it "does not skips builds creation if there is no [ci skip] tag in commit message" do allow_any_instance_of(Ci::Pipeline).to receive(:git_commit_message) { "some message" } |