buildkite-builder 3.3.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2946cdcde9aa6a6474bb3f9464d77b5ac9831fe1c5f3a27e289017e215f711a4
-  data.tar.gz: 6cbc69d2ea605f0427577daf28ed0243f56ccb3b12338662c08d377774ac5177
+  metadata.gz: 2e74780f14a94f7db9cdac81ed2f28657f94dc9547d5b8bc54c10b7f8797c256
+  data.tar.gz: 0c2191c768092e804eb7b9623234d46c9c1496fdc8062bd5dcaf45a2de48c7a9
 SHA512:
-  metadata.gz: 04b63489255060c1237b8c25094b0aba3e99fe08079d23ab13173392e36908bf9db798224b70e5c28dfaccbb9323dfd2c11c8e4446bad0a9fd6fd4d74b44de8a
-  data.tar.gz: b1685985083035299d690371891f05d16c0dc932b159551f1b1ae23d645c4764d63456f44d29ce72e97251ad38ac6229622ba7795d173f8acc72a1ad09e8756e
+  metadata.gz: 9632e4990ba1d48ea5231d256e8a9143a99ff3a6fdabc41635e71c3092a0a89a839359819a6feffdb0357f006f894d3d40235efd0ebece5d4e4bca85f3d59c64
+  data.tar.gz: bd5848e4a08412331d740aebacd0f9373009ca12427598943c7de630302a4ad7ab6f2907d790052e496433f8cd1463f7cc340212ef4dead044691bd5081f0657

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 3.4.0
+* `automatically_retry(status:, limit:)` has been renamed to `automatic_retry_on(exit_status:, limit:)`
+* Added `automatic_retry` for setting boolean for `retry.automatic`
+* Added `manual_retry` for setting `retry.manual`
+
+## 3.3.2
+* Fix subpipeline trigger step attributes leak to subpipeline.
+
+## 3.3.1
+* Add support to iterate over subpipelines.
+* Allow build options to be passed to subpipelines.
+
 ## 3.3.0
 * Remove arguments in sub-pipeline's trigger step setup and use dsl delegation instead.
 

data/VERSION

@@ -1 +1 @@
-3.3.0
+3.4.0

data/lib/buildkite/builder/extensions/sub_pipelines.rb

@@ -18,6 +18,7 @@ module Buildkite
           attribute :allow_dependency_failure
           attribute :branches
           attribute :async
+          attribute :build
 
           def self.to_sym
             name.split('::').last.downcase.to_sym
@@ -44,13 +45,12 @@ module Buildkite
           end
 
           def to_h
-            attributes = super
             # Merge envs from main pipeline, since ruby does not have `reverse_merge` and
             # `data` does not allow keys override, we have to reset the data hash per key.
             @context.data.env.merge(data.env).each do |key, value|
               data.env[key] = value
             end
-            attributes.merge(data.to_definition)
+            data.to_definition
           end
 
           def method_missing(method_name, *args, **kwargs, &_block)
@@ -76,7 +76,8 @@ module Buildkite
 
             trigger_step = context.data.steps.add(Pipelines::Steps::Trigger)
             trigger_step.trigger(name)
-            trigger_step.build(
+
+            build_options = {
               message: '${BUILDKITE_MESSAGE}',
               commit: '${BUILDKITE_COMMIT}',
               branch: '${BUILDKITE_BRANCH}',
@@ -86,8 +87,10 @@ module Buildkite
                 BUILDKITE_PULL_REQUEST_REPO: '${BUILDKITE_PULL_REQUEST_REPO}',
                 BKB_SUBPIPELINE_FILE: sub_pipeline.pipeline_yml
               }
-            )
+            }
+            build_options.merge!(sub_pipeline.build) if sub_pipeline.build
 
+            trigger_step.build(build_options)
             trigger_step.key(sub_pipeline.key || "subpipeline_#{name}_#{context.data.pipelines.count}")
             trigger_step.label(sub_pipeline.label || name.capitalize)
             trigger_step.async(sub_pipeline.async || false)

data/lib/buildkite/builder/pipeline_collection.rb

@@ -8,6 +8,7 @@ module Buildkite
       attr_reader :pipelines
 
       def_delegator :@pipelines, :count
+      def_delegator :@pipelines, :each
 
       def initialize(artifacts)
         @artifacts = artifacts

data/lib/buildkite/pipelines/helpers/retry.rb

@@ -4,15 +4,26 @@ module Buildkite
   module Pipelines
     module Helpers
       module Retry
-        def automatically_retry(status:, limit:)
-          retry_value = get(:retry)&.[](:automatic)
+        def automatic_retry_on(exit_status:, limit:)
+          retry_value = get(:retry) || set(:retry, {})
 
-          unless retry_value.is_a?(Array)
-            retry_value = []
-            self.retry(automatic: retry_value)
+          unless retry_value[:automatic].is_a?(Array)
+            retry_value[:automatic] = []
           end
 
-          retry_value.push(exit_status: status, limit: limit)
+          retry_value[:automatic].push(exit_status: exit_status, limit: limit)
+        end
+
+        def automatic_retry(enabled)
+          retry_value = get(:retry) || set(:retry, {})
+          retry_value[:automatic] = enabled
+        end
+
+        def manual_retry(allowed, reason: nil, permit_on_passed: nil)
+          retry_value = get(:retry) || set(:retry, {})
+          retry_value[:manual] = { allowed: allowed }
+          retry_value[:manual][:reason] = reason unless reason.nil?
+          retry_value[:manual][:permit_on_passed] = permit_on_passed unless permit_on_passed.nil?
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: buildkite-builder
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.0
 platform: ruby
 authors:
 - Ngan Pham
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-15 00:00:00.000000000 Z
+date: 2022-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -40,21 +40,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: debug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="