buildkite-builder 3.2.0 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d50f76bdcfda9a7561fce2b86dbae5b0ea99d37c0dbd6c763b35541a39e904c8
-  data.tar.gz: 2fbd91625db37b0bf88546931254b4f4024de25d3d20d09267318eafae2e3646
+  metadata.gz: 25e5b7c5ee30bb570f214b7061ecc8c9dee2e118e0116ddfe2cc3d070fb2bed5
+  data.tar.gz: a9bad724efa96a3a613eb3c7e3e016c0697d9d4c6e66deba2e09d3056651aad9
 SHA512:
-  metadata.gz: 5902b46da66c6ec7828d1bdf4f148f5445f2c7820e9f209e4a7ea22dae1ac8e62ea397660cca1f512737681c4c9397b97d5361f0fd64dba95066cb32751489ad
-  data.tar.gz: f67169e9bbdb7b84ccc1a6a8fec9593e878b70759e74f7236f595a3772649ce140d3ae99a329e090fb514c9bbbb450d70e58ea6362459404bced23f4a575cab1
+  metadata.gz: 6e6758542d63fdfe9b824a5c47765f01ed8ed8aea0130da1249aa9e2f6c7b593ee4bde1ea69b92b897d1ef8e0f1a9df235dddd87a36b0c807496bfefc98ad993
+  data.tar.gz: d91ce92070ebacf6b22477c6b16a353578d6c52231c20e6f21f45675ee9e21f889263aa4454b1c5173c069984ae34fbd1b16e9037fdb479ab7cf9447c3cf97e4

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 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.
+
 ## 3.2.0
 * Remove `template` from sub-pipeline trigger step setup and use arguments instead.
 

data/VERSION

@@ -1 +1 @@
-3.2.0
+3.3.2

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

@@ -9,8 +9,16 @@ module Buildkite
 
           attr_reader :data, :name, :dsl
 
-          attribute :depends_on, append: true
+          # These attributes are for triggered step
+          attribute :label
           attribute :key
+          attribute :skip
+          attribute :if, as: :condition
+          attribute :depends_on, append: true
+          attribute :allow_dependency_failure
+          attribute :branches
+          attribute :async
+          attribute :build
 
           def self.to_sym
             name.split('::').last.downcase.to_sym
@@ -37,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)
@@ -60,44 +67,38 @@ module Buildkite
         end
 
         dsl do
-          def pipeline(name, **options, &block)
+          def pipeline(name, &block)
             raise "Subpipeline must have a name" if name.empty?
             raise "Subpipeline does not allow nested in another Subpipeline" if context.is_a?(Buildkite::Builder::Extensions::SubPipelines::Pipeline)
 
             sub_pipeline = Buildkite::Builder::Extensions::SubPipelines::Pipeline.new(name, context, &block)
             context.data.pipelines.add(sub_pipeline)
 
-            options = options.slice(:key, :label, :async, :branches, :condition, :depends_on, :allow_dependency_failure, :skip, :emoji)
-            options[:key] ||= "subpipeline_#{name}_#{context.data.pipelines.count}"
-            options[:label] ||= name.capitalize
-
-            if options[:emoji]
-              emoji = Array(options.delete(:emoji)).map { |name| ":#{name}:" }.join
-              options[:label] = [emoji, options[:label]].compact.join(' ')
-            end
-
-            context.data.steps.add(Pipelines::Steps::Trigger, **options) do |context|
-              key context[:key]
-              label context[:label]
-              trigger name
-              build(
-                message: '${BUILDKITE_MESSAGE}',
-                commit: '${BUILDKITE_COMMIT}',
-                branch: '${BUILDKITE_BRANCH}',
-                env: {
-                  BUILDKITE_PULL_REQUEST: '${BUILDKITE_PULL_REQUEST}',
-                  BUILDKITE_PULL_REQUEST_BASE_BRANCH: '${BUILDKITE_PULL_REQUEST_BASE_BRANCH}',
-                  BUILDKITE_PULL_REQUEST_REPO: '${BUILDKITE_PULL_REQUEST_REPO}',
-                  BKB_SUBPIPELINE_FILE: sub_pipeline.pipeline_yml
-                }
-              )
-              async context[:async] || false
-              branches context[:branches] if context[:branches]
-              condition context[:condition] if context[:condition]
-              depends_on *context[:depends_on] if context[:depends_on]
-              allow_dependency_failure context[:allow_dependency_failure] || false
-              skip context[:skip] || false
-            end
+            trigger_step = context.data.steps.add(Pipelines::Steps::Trigger)
+            trigger_step.trigger(name)
+
+            build_options = {
+              message: '${BUILDKITE_MESSAGE}',
+              commit: '${BUILDKITE_COMMIT}',
+              branch: '${BUILDKITE_BRANCH}',
+              env: {
+                BUILDKITE_PULL_REQUEST: '${BUILDKITE_PULL_REQUEST}',
+                BUILDKITE_PULL_REQUEST_BASE_BRANCH: '${BUILDKITE_PULL_REQUEST_BASE_BRANCH}',
+                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)
+            trigger_step.branches(sub_pipeline.branches) if sub_pipeline.branches
+            trigger_step.condition(sub_pipeline.condition) if sub_pipeline.condition
+            trigger_step.depends_on(*sub_pipeline.get('depends_on')) if sub_pipeline.get('depends_on')
+            trigger_step.allow_dependency_failure(sub_pipeline.allow_dependency_failure || false)
+            trigger_step.skip(sub_pipeline.skip || false)
           end
         end
       end

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: buildkite-builder
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.2
 platform: ruby
 authors:
 - Ngan Pham
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-13 00:00:00.000000000 Z
+date: 2022-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -192,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.13
 signing_key:
 specification_version: 4
 summary: A gem for programmatically creating Buildkite pipelines.