gitlabci-bundle-update-mr 5.0.2 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4415f0c023d0f8b003ecca1125cb7af21c1755b1871d3e072cb23645ec37992c
-  data.tar.gz: 993d777b563c5a379bde8cc1dac59e818f086d8f6cbaad3779b0402a23ae4541
+  metadata.gz: 8aca5941da45bdd58c50b8b80f042f54c9938ecf9b9a707bea62e1b0ba616e25
+  data.tar.gz: 57e30cfb698a4f082d9043017c909c41a37b5c4af44ec3787c33ffd94bda8a31
 SHA512:
-  metadata.gz: d36e5b53edc35e796d7636973af834b110e066b83848753f7ff295f14638441f5f9f67bb9ddf44576ad8b86ad6b6382365685e7e28ac94edb0d2ec5f75195c93
-  data.tar.gz: '052809f3b7d3a51ec98a6435e65e2855f7406e0718f13b73e6610bc3142006a481eb1193b1788bed8282c8b55d63e91864999aa665f4674280888ee8393080e6'
+  metadata.gz: 1fc7f885f8874d20526d1160b931a924cced137c5295df85c957422ebe158b3c0c3bf2bd121c5347caacaad3dc0618d2efad554c14d09637562c78c419d1a037
+  data.tar.gz: 2e75381611d70e064194d319186cd4a7882deee2c8bc30a498c1b5295f465e3529461ced7fa56f5a6806ef6c7a8266b8e94f530de95716ffef7e7d7b5fb5a468

data/.gitlab-ci.yml

@@ -3,21 +3,16 @@ stages:
   - deploy
 
 include:
-  - local: "/gitlabci-templates/continuous_bundle_update.yml"
+  - local: gitlabci-components/continuous_bundle_update.yml
+    inputs:
+      merge_when_pipeline_succeeds: true
+      job_stage: build
+      assignees: sue445
 
-continuous_bundle_update:
-  stage: build
-
-  variables:
-    CACHE_VERSION: "v2"
-    GIT_EMAIL:     "gitlabci@example.com"
-    GIT_USER:      "GitLab CI"
-    OPTIONS:       "--merge-when-pipeline-succeeds"
-    ASSIGNEES:     "sue445"
-
-  before_script:
-    # Set timezone to Asia/Tokyo
-    - cp /usr/share/zoneinfo/Asia/Tokyo /etc/localtime
+      job_before_script:
+        - set -xe # TODO: debug
+        # Set timezone to Asia/Tokyo
+        - cp /usr/share/zoneinfo/Asia/Tokyo /etc/localtime
 
 .default:
   cache:
@@ -79,6 +74,8 @@ pages:
     paths:
       - public
   rules:
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
+      when: never
     - if: '$CI_COMMIT_BRANCH == "master"'
 
 gitlab_awesome_release:

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 ## Unreleased
-[full changelog](https://gitlab.com/sue445/gitlabci-bundle-update-mr/compare/v5.0.2...master)
+[full changelog](https://gitlab.com/sue445/gitlabci-bundle-update-mr/compare/v5.1.0...master)
+
+## v5.1.0
+[full changelog](https://gitlab.com/sue445/gitlabci-bundle-update-mr/compare/v5.0.2...v5.1.0)
+
+* Pass both `merge_when_pipeline_succeeds` and `auto_merge` to Merge a merge request API
+  * https://gitlab.com/sue445/gitlabci-bundle-update-mr/-/merge_requests/368
+* Add gitlabci-components/continuous_bundle_update.yml
+  * https://gitlab.com/sue445/gitlabci-bundle-update-mr/-/merge_requests/364
+* Tweak cli description
+  * https://gitlab.com/sue445/gitlabci-bundle-update-mr/-/merge_requests/370
 
 ## v5.0.2
 [full changelog](https://gitlab.com/sue445/gitlabci-bundle-update-mr/compare/v5.0.1...v5.0.2)

data/Gemfile

@@ -6,6 +6,3 @@ gemspec
 
 # FIXME: following gems are often downgraded when `bundle update`
 gem "sawyer", ">= 0.8.1"
-
-# octokit 5.0.0+ requires Ruby 2.7.0+
-gem "octokit", "< 5.0.0"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlabci-bundle-update-mr (5.0.2)
+    gitlabci-bundle-update-mr (5.1.0)
       bundler
       compare_linker (>= 1.4.11)
       git (= 1.7.0)
@@ -13,9 +13,9 @@ GEM
   specs:
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
-    ast (2.4.2)
+    ast (2.4.3)
     base64 (0.2.0)
-    bigdecimal (3.1.9)
+    bigdecimal (3.2.3)
     compare_linker (1.4.11)
       base64
       httpclient
@@ -24,19 +24,19 @@ GEM
     crack (1.0.0)
       bigdecimal
       rexml
-    csv (3.3.2)
-    diff-lcs (1.6.0)
+    csv (3.3.5)
+    diff-lcs (1.6.2)
     docile (1.4.1)
-    dotenv (3.1.7)
-    faraday (2.12.2)
+    dotenv (3.1.8)
+    faraday (2.14.0)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
-    faraday-net_http (3.4.0)
+    faraday-net_http (3.4.1)
       net-http (>= 0.5.0)
     git (1.7.0)
       rchardet (~> 1.8)
-    gitlab (5.1.0)
+    gitlab (6.0.0)
       base64 (~> 0.2.0)
       httparty (~> 0.20)
       terminal-table (>= 1.5.1)
@@ -45,19 +45,19 @@ GEM
       gitlab (>= 4.0.0)
       logger
       thor
-    hashdiff (1.1.2)
-    httparty (0.22.0)
+    hashdiff (1.2.1)
+    httparty (0.23.1)
       csv
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
     httpclient (2.9.0)
       mutex_m
-    json (2.10.1)
-    language_server-protocol (3.17.0.4)
+    json (2.15.0)
+    language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
-    logger (1.6.6)
+    logger (1.7.0)
     mini_mime (1.1.5)
-    multi_xml (0.7.1)
+    multi_xml (0.7.2)
       bigdecimal (~> 3.1)
     mutex_m (0.3.0)
     net-http (0.6.0)
@@ -68,40 +68,41 @@ GEM
     onkcop (1.0.0.0)
       rubocop (>= 0.80.0)
       rubocop-rspec (>= 1.34.0)
-    ostruct (0.6.1)
-    parallel (1.26.3)
-    parser (3.3.7.1)
+    ostruct (0.6.3)
+    parallel (1.27.0)
+    parser (3.3.9.0)
       ast (~> 2.4.1)
       racc
-    public_suffix (6.0.1)
+    prism (1.5.1)
+    public_suffix (6.0.2)
     racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.2.1)
-    rchardet (1.9.0)
-    regexp_parser (2.10.0)
+    rake (13.3.0)
+    rchardet (1.10.0)
+    regexp_parser (2.11.3)
     restore_bundled_with (1.0.0)
       git
       thor
-    rexml (3.4.1)
-    rspec (3.13.0)
+    rexml (3.4.4)
+    rspec (3.13.1)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.3)
+    rspec-core (3.13.5)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.3)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-its (2.0.0)
       rspec-core (>= 3.13.0)
       rspec-expectations (>= 3.13.0)
-    rspec-mocks (3.13.2)
+    rspec-mocks (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.2)
+    rspec-support (3.13.6)
     rspec-temp_dir (1.1.1)
       rspec (>= 3.0)
-    rubocop (1.72.2)
+    rubocop (1.81.1)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -109,16 +110,17 @@ GEM
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.38.0, < 2.0)
+      rubocop-ast (>= 1.47.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.38.0)
-      parser (>= 3.3.1.0)
-    rubocop-performance (1.24.0)
+    rubocop-ast (1.47.1)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-performance (1.26.0)
       lint_roller (~> 1.1)
-      rubocop (>= 1.72.1, < 2.0)
-      rubocop-ast (>= 1.38.0, < 2.0)
-    rubocop-rspec (3.5.0)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
+    rubocop-rspec (3.7.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
     rubocop_auto_corrector (0.5.0)
@@ -131,19 +133,19 @@ GEM
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-cobertura (2.1.0)
+    simplecov-cobertura (3.1.0)
       rexml
       simplecov (~> 0.19)
-    simplecov-html (0.13.1)
+    simplecov-html (0.13.2)
     simplecov_json_formatter (0.1.4)
     terminal-table (4.0.0)
       unicode-display_width (>= 1.1.1, < 4)
-    thor (1.3.2)
-    unicode-display_width (3.1.4)
-      unicode-emoji (~> 4.0, >= 4.0.4)
-    unicode-emoji (4.0.4)
-    uri (1.0.2)
-    webmock (3.25.0)
+    thor (1.4.0)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.1.0)
+    uri (1.0.3)
+    webmock (3.25.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -156,7 +158,6 @@ DEPENDENCIES
   dotenv
   gitlab_awesome_release
   gitlabci-bundle-update-mr!
-  octokit (< 5.0.0)
   onkcop (>= 1.0.0.0)
   rake (>= 10.0)
   rspec (~> 3.0)

data/README.md

@@ -86,8 +86,8 @@ continuous_bundle_update:
     - schedules
 ```
 
-### Step 1-B. Using `include`
-`include` is available in one of the following versions.
+### Step 1-B. Using `include` template (Deprecated)
+`include` template is available in one of the following versions.
 
 * GitLab Core 11.4+
 * GitLab Premium 10.5+
@@ -119,6 +119,38 @@ continuous_bundle_update:
     - cp /usr/share/zoneinfo/Asia/Tokyo /etc/localtime
 ```
 
+### Step 1-C. Using `include` component
+[CI/CD components](https://docs.gitlab.com/ci/components/) is available since GitLab 17.0+
+
+example (minimum)
+
+```yml
+include:
+  - remote: https://gitlab.com/sue445/gitlabci-bundle-update-mr/-/raw/master/gitlabci-components/continuous_bundle_update.yml
+```
+
+example (custom)
+
+```yml
+include:
+  - remote: https://gitlab.com/sue445/gitlabci-bundle-update-mr/-/raw/master/gitlabci-components/continuous_bundle_update.yml
+    inputs:
+      merge_when_pipeline_succeeds: true
+      job_stage: build
+
+      job_before_script:
+        - cp /usr/share/zoneinfo/Asia/Tokyo /etc/localtime
+
+      job_rules:
+        - if: '$CI_PIPELINE_SOURCE == "schedule" && $CI_PIPELINE_SCHEDULE_DESCRIPTION == "continuous_bundle_update"'
+        - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+          when: never
+```
+
+full options are following.
+
+[gitlabci-components/continuous_bundle_update.yml](gitlabci-components/continuous_bundle_update.yml)
+
 ### Step 2. Register scheduler
 And register scheduler to `https://YOUR-GITLAB/YOUR-NAME/REPO-NAME/pipeline_schedules`
 
@@ -134,7 +166,7 @@ Usage: gitlabci-bundle-update-mr [options]
     -l, --labels 'In Review, Update' Add labels to the MR
         --update-bundled-with        Whether to update `BUNDLED WITH` section in Gemfie.lock (default. false)
         --merge-when-pipeline-succeeds
-                                     Whether to set 'Merge when pipeline succeeds' (default. false)
+                                     Whether to set 'Auto-merge' (formerly 'Merge when pipeline succeeds') (default. false)
         --assignees 'foo, bar'       Add assignees to the MR
 ```
 

data/exe/gitlabci-bundle-update-mr

@@ -18,7 +18,11 @@ opt.on("--user USER", "git username (default. `git config user.name`)") {|v| aut
 opt.on("-d", "--duplicate", "Make MR even if it has already existed (default. false)") {|v| allow_dup_mr = v }
 opt.on("-l", "--labels 'In Review, Update'", Array, "Add labels to the MR") {|v| mr_labels = v.map(&:strip) }
 opt.on("--update-bundled-with", "Whether to update `BUNDLED WITH` section in Gemfie.lock (default. false)") {|v| update_bundled_with = v }
-opt.on("--merge-when-pipeline-succeeds", "Whether to set 'Merge when pipeline succeeds' (default. false)") {|v| merge_when_pipeline_succeeds = v }
+
+opt.on("--merge-when-pipeline-succeeds", "Whether to set 'Auto-merge' (formerly 'Merge when pipeline succeeds') (default. false)") do |v|
+  merge_when_pipeline_succeeds = v
+end
+
 opt.on("--assignees 'foo, bar'", Array, "Add assignees to the MR") {|v| assignees = v.map(&:strip) }
 
 opt.parse!(ARGV)

data/gitlabci-components/continuous_bundle_update.yml

@@ -0,0 +1,115 @@
+spec:
+  inputs:
+    job_name:
+      default: continuous_bundle_update
+
+    job_stage:
+      default: test
+
+    job_image:
+      default: ruby
+
+    job_before_script:
+      type: array
+      default: []
+
+    job_rules:
+      type: array
+      default:
+        - if: '$CI_PIPELINE_SOURCE == "schedule"'
+        - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+          when: never
+
+    cache_key:
+      default: "v1-$CI_JOB_NAME_SLUG"
+
+    git_email:
+      default: "gitlabci@example.com"
+
+    git_user:
+      default: "GitLab CI"
+
+    gem_version:
+      default: ""
+      description: "gitlabci-bundle-update-mr version (default: latest)"
+
+    gem_install_options:
+      default: "--no-doc"
+      description: "Passed to 'gem install gitlabci-bundle-update-mr'"
+
+    labels:
+      default: "bundle update"
+      description: "Add labels to the MR (e.g. 'In Review, Update')"
+
+    assignees:
+      default: ""
+      description: "Add assignees to the MR (e.g. 'foo, bar')"
+
+    duplicate:
+      type: boolean
+      default: false
+      description: "Make MR even if it has already existed"
+
+    update_bundled_with:
+      type: boolean
+      default: false
+      description: "Whether to update `BUNDLED WITH` section in Gemfile.lock"
+
+    merge_when_pipeline_succeeds:
+      type: boolean
+      default: false
+      description: "Whether to set 'Merge when pipeline succeeds'"
+
+---
+
+$[[ inputs.job_name ]]:
+  image: $[[ inputs.job_image ]]
+
+  stage: $[[ inputs.job_stage ]]
+
+  variables:
+    GIT_EMAIL:                    $[[ inputs.git_email ]]
+    GIT_USER:                     $[[ inputs.git_user ]]
+    GEM_VERSION:                  $[[ inputs.gem_version ]]
+    GEM_INSTALL_OPTIONS:          $[[ inputs.gem_install_options ]]
+    LABELS:                       $[[ inputs.labels ]]
+    ASSIGNEES:                    $[[ inputs.assignees ]]
+    DUPLICATE:                    $[[ inputs.duplicate ]]
+    UPDATE_BUNDLED_WITH:          $[[ inputs.update_bundled_with ]]
+    MERGE_WHEN_PIPELINE_SUCCEEDS: $[[ inputs.merge_when_pipeline_succeeds ]]
+
+  cache:
+    key: $[[ inputs.cache_key ]]
+    paths:
+      - vendor/bundle/
+
+  before_script: $[[ inputs.job_before_script ]]
+
+  script:
+    - bundle config --local path 'vendor/bundle'
+    - bundle install --retry=3 --jobs=$(nproc)
+    - bundle clean
+    - |
+      if [ -n "$GEM_VERSION" ]; then
+        GEM_INSTALL_OPTIONS="--version $GEM_VERSION $GEM_INSTALL_OPTIONS"
+      fi
+    - gem install gitlabci-bundle-update-mr $GEM_INSTALL_OPTIONS
+
+    - |
+      OPTIONS=""
+      if [ -n "$ASSIGNEES" ]; then
+        OPTIONS="$OPTIONS --assignees $ASSIGNEES"
+      fi
+      if $DUPLICATE; then
+        OPTIONS="$OPTIONS --duplicate"
+      fi
+      if $UPDATE_BUNDLED_WITH; then
+        OPTIONS="$OPTIONS --update-bundled-with"
+      fi
+      if $MERGE_WHEN_PIPELINE_SUCCEEDS; then
+        OPTIONS="$OPTIONS --merge-when-pipeline-succeeds"
+      fi
+
+    - gitlabci-bundle-update-mr --user="$GIT_USER" --email="$GIT_EMAIL" --labels="$LABELS" $OPTIONS
+
+  rules: $[[ inputs.job_rules ]]

data/lib/gitlabci/bundle/update/mr/client.rb

@@ -208,7 +208,7 @@ module Gitlabci
 
             def accept_merge_request(mr_id)
               with_retry do
-                @gitlab.accept_merge_request(@project_name, mr_id, merge_when_pipeline_succeeds: true, should_remove_source_branch: true)
+                @gitlab.accept_merge_request(@project_name, mr_id, merge_when_pipeline_succeeds: true, auto_merge: true, should_remove_source_branch: true)
               end
             end
 

data/lib/gitlabci/bundle/update/mr/version.rb

@@ -2,7 +2,7 @@ module Gitlabci
   module Bundle
     module Update
       module Mr
-        VERSION = "5.0.2".freeze
+        VERSION = "5.1.0".freeze
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: gitlabci-bundle-update-mr
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.1.0
 platform: ruby
 authors:
 - sue445
 bindir: exe
 cert_chain: []
-date: 2025-02-22 00:00:00.000000000 Z
+date: 2025-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -329,6 +329,7 @@ files:
 - bin/setup
 - exe/gitlabci-bundle-update-mr
 - gitlabci-bundle-update-mr.gemspec
+- gitlabci-components/continuous_bundle_update.yml
 - gitlabci-templates/continuous_bundle_update.yml
 - lib/gitlabci/bundle/update/mr.rb
 - lib/gitlabci/bundle/update/mr/client.rb