Commit 11d15885 authored by Lin Jen-Shin's avatar Lin Jen-Shin

Merge branch 'yamllint-warnings' into 'master'

Clean up some yamllint warnings

See merge request gitlab-org/gitlab!77486
parents 5e90c85a 4a83cb27
...@@ -256,7 +256,7 @@ ...@@ -256,7 +256,7 @@
- "lib/gitlab/markdown_cache/active_record/**/*" - "lib/gitlab/markdown_cache/active_record/**/*"
- "config/prometheus/common_metrics.yml" # Used by Gitlab::DatabaseImporters::CommonMetrics::Importer - "config/prometheus/common_metrics.yml" # Used by Gitlab::DatabaseImporters::CommonMetrics::Importer
- "{,ee/,jh/}app/models/project_statistics.rb" # Used to calculate sizes in migration specs - "{,ee/,jh/}app/models/project_statistics.rb" # Used to calculate sizes in migration specs
- "GITALY_SERVER_VERSION" # Has interactions with background migrations:https://gitlab.com/gitlab-org/gitlab/-/issues/336538 - "GITALY_SERVER_VERSION" # Has interactions with background migrations:https://gitlab.com/gitlab-org/gitlab/-/issues/336538
# CI changes # CI changes
- ".gitlab-ci.yml" - ".gitlab-ci.yml"
- ".gitlab/ci/**/*" - ".gitlab/ci/**/*"
...@@ -1679,7 +1679,7 @@ ...@@ -1679,7 +1679,7 @@
- <<: *if-dot-com-gitlab-org-merge-request - <<: *if-dot-com-gitlab-org-merge-request
changes: *code-patterns changes: *code-patterns
when: manual when: manual
allow_failure: true # manual jobs needs to be allowed to fail, otherwise they block the pipeline allow_failure: true # manual jobs needs to be allowed to fail, otherwise they block the pipeline
- when: on_success - when: on_success
allow_failure: true allow_failure: true
......
...@@ -4,7 +4,7 @@ workhorse:verify: ...@@ -4,7 +4,7 @@ workhorse:verify:
stage: test stage: test
needs: [] needs: []
script: script:
- make -C workhorse # test build - make -C workhorse # test build
- make -C workhorse verify - make -C workhorse verify
.workhorse:test: .workhorse:test:
......
...@@ -29,7 +29,7 @@ before_script: ...@@ -29,7 +29,7 @@ before_script:
- ruby -v # Print out ruby version for debugging - ruby -v # Print out ruby version for debugging
# Uncomment next line if your rails app needs a JS runtime: # Uncomment next line if your rails app needs a JS runtime:
# - apt-get update -q && apt-get install nodejs -yqq # - apt-get update -q && apt-get install nodejs -yqq
- bundle config set path 'vendor' # Install dependencies into ./vendor/ruby - bundle config set path 'vendor' # Install dependencies into ./vendor/ruby
- bundle install -j $(nproc) - bundle install -j $(nproc)
# Optional - Delete if not using `rubocop` # Optional - Delete if not using `rubocop`
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment