buildkite-builder 4.2.1 → 4.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a8781f1d4e933a20eae5cc484f9c7d8fe11e1606fb89981819d3b94c6b79622
-  data.tar.gz: 9c48682aaed76cf3d72a25a6c8633395243b153c0cd3a7ea4d1310ac6776546d
+  metadata.gz: 368db189b191972229ed317ee1afda33c7827bead16c641324b34312a7e7dbcc
+  data.tar.gz: 552bec587cfae42895bd90467f9c3f558d11409c1db501f60144ebb590467b52
 SHA512:
-  metadata.gz: 45973c8d81a01fd188822260e62d60d2c2a5ed7cb6dde21d530d3a31c0327e4d065639934c82d7528a218505d902b67d1cfe11c1d088b61bff5ddbb3997a8a08
-  data.tar.gz: 5a37e559b446888b8812ecca4a2fd3592138c6adbd6a3f56f82d80bd5b5adb6b64d411ac986b678c42e3537e7dab16c91b8e289f0171707d2d4f69da4aeaf4de
+  metadata.gz: 8deb3a535a9dc881bd97a35bf71b0306b7ba4dc246dd5fc568e7c44f064f8e93e60cb50c2bda0c8438cacc462e1919ff3d53466b693d1b39bde7005df1fbc95d
+  data.tar.gz: 7f0d2e0d4a02f6f6ba99422c5215fea487adb6926d7300b7be447d37dd10fd9365c1be58864f9cc9816e03ee55c3c6e2d6d0293db344a4e9c0e3de0a76b41193

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+### 4.2.2
+* Use step id to distinguish different piplelines, fix re-uploading pipeline on same step issue.
+
 ### 4.2.1
 * Allow uploading pipeline to different jobs
 

data/VERSION

@@ -1 +1 @@
-4.2.1
+4.2.2

data/lib/buildkite/builder/commands/run.rb

@@ -17,8 +17,8 @@ module Buildkite
           # variables to be set. It also uploads the pipeline to Buildkite.
           log.info "+++ 🧰 #{'Buildkite Builder'.color(:springgreen)} v#{Buildkite::Builder.version} ─ #{relative_pipeline_path.to_s.yellow}"
 
-          if Buildkite::Pipelines::Command.meta_data(:get, Builder::META_DATA.fetch(:job)) == Buildkite.env.job_id
-            log.info "Pipeline already uploaded in #{Buildkite.env.job_id}".color(:dimgray)
+          if Buildkite::Pipelines::Command.meta_data(:get, Builder.meta_data.fetch(:job)) == Buildkite.env.step_id
+            log.info "Pipeline already uploaded in #{Buildkite.env.step_id} step".color(:dimgray)
           else
             Pipeline.new(pipeline_path, logger: log).upload
           end

data/lib/buildkite/builder/pipeline.rb

@@ -57,7 +57,7 @@ module Buildkite
             abort
           end
           logger.info "+++ :toolbox: Setting job meta-data to #{Buildkite.env.job_id.color(:yellow)}"
-          Buildkite::Pipelines::Command.meta_data!(:set, Builder::META_DATA.fetch(:job), Buildkite.env.job_id)
+          Buildkite::Pipelines::Command.meta_data!(:set, Builder.meta_data.fetch(:job), Buildkite.env.step_id)
         end
       end
 

data/lib/buildkite/builder.rb

@@ -23,11 +23,14 @@ module Buildkite
     autoload :PluginManager, File.expand_path('builder/plugin_manager', __dir__)
 
     BUILDKITE_DIRECTORY_NAME = Pathname.new('.buildkite').freeze
-    META_DATA = {
-      job: 'buildkite-builder:job'
-    }.freeze
 
     class << self
+      def meta_data
+        @meta_data ||= {
+          job: "buildkite-builder:#{Buildkite.env.step_id}"
+        }
+      end
+
       def root(start_path: Dir.pwd, reset: false)
         @root = nil if reset
         @root ||= find_buildkite_directory(start_path)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: buildkite-builder
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 4.2.2
 platform: ruby
 authors:
 - Ngan Pham
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-21 00:00:00.000000000 Z
+date: 2023-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow