diff options
| -rw-r--r-- | .gitlab-ci.yml | 11 | ||||
| -rw-r--r-- | .gitlab/merge_request_templates/Gems Update.md | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
3 files changed, 9 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a0088efa..ab721c68 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -331,8 +331,8 @@ pages: # - master # -# Helper Docker image containing all build dependencies -# It must be rebuilt every time Gemfile.lock changes +# Helper Docker image containing all build dependencies. +# It must be rebuilt every time Gemfile and/or Gemfile.lock changes. # image:bootstrap: <<: *docker_prepare @@ -343,8 +343,11 @@ image:bootstrap: script: - docker build -t $IMAGE_NAME -f $DOCKERFILE . - docker push $IMAGE_NAME - when: manual - <<: *except_stable + only: + refs: + - master + changes: + - "Gemfile*" # # Helper Docker image that builds the gitlab-docs website diff --git a/.gitlab/merge_request_templates/Gems Update.md b/.gitlab/merge_request_templates/Gems Update.md index 9e502291..60f38246 100644 --- a/.gitlab/merge_request_templates/Gems Update.md +++ b/.gitlab/merge_request_templates/Gems Update.md @@ -2,6 +2,4 @@ Update gems using `bundle update`. <!-- Do not edit below this line --> -- [ ] **Run the `image:bootstrap` manual job right after this MR is merged** - /label ~backstage diff --git a/Gemfile.lock b/Gemfile.lock index af352424..713fff74 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -51,7 +51,7 @@ GEM concurrent-ruby (~> 1.0) highline (2.0.2) http_parser.rb (0.6.0) - json_schema (0.20.4) + json_schema (0.20.5) kramdown (1.16.2) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) @@ -140,7 +140,7 @@ GEM tty-command (0.8.2) pastel (~> 0.7.0) tty-cursor (0.6.1) - tty-file (0.7.0) + tty-file (0.7.1) diff-lcs (~> 1.3) pastel (~> 0.7.2) tty-prompt (~> 0.18) |