build-labels 0.0.60 → 0.0.62

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 5222abdc8405b20d9b82f512bfb6ce8f558e34d37c4258d15f23c3c12ec5c5e9
4
- data.tar.gz: f8fcd2ba6343f7e8be33adcee2f54e109ddb9d900de5698c0d322bdff123ea2b
3
+ metadata.gz: 52d024582ec3ec30626af90539ca7ae4494629595185c9d5d1be362055972735
4
+ data.tar.gz: 5cf8deb9d9342408f538562c53c7c44134367969a721a991400f8fd26750ae10
5
5
  SHA512:
6
- metadata.gz: 58f80b464208f1e86ffa1e86238bb4fa1ff7b09e2b9eb906279cf3284bd50143cd94c89400243a77e051e3cca0f38971417a1704b16914b94347c351af72d8b3
7
- data.tar.gz: a53a6b1214c62b7e4961797b4ef1ff692bc3744943e3534c2b0e96a51277f1947c71d9facc88a7182eec99e10b42bce3f91f9b896234ddd8531063b920aa7fcd
6
+ metadata.gz: bcaa9fd23e46c6177cbea90ac579e5e323db068247dc17a440214471fa00090e56897674756856caadb8e684c96191ed831dd77e3c2bce8cb7fe8a1d1e3d2996
7
+ data.tar.gz: 1fd00770d259adb218ee7440ae9fad01fb5459784a595a169b3a88abd9bd78858cd6505129853d0745d9c68358ed7ef96bbc5c9cdc490cf5a68cc2f27bcc14b1
@@ -7,7 +7,13 @@ BuildLabels::CommandLine::COMMANDS[:changed] = Class.new do
7
7
 
8
8
  def run(builder, params, compose)
9
9
  dc_folder = params[:'changes-compose'] || Dir.pwd
10
- $stderr.puts "Changes Compose: #{dc_folder}, CI_COMMIT_BEFORE_SHA: #{ENV['CI_COMMIT_BEFORE_SHA']}, CI_COMMIT_SHA: #{ENV['CI_COMMIT_SHA']}"
10
+ git_root = `git rev-parse --show-toplevel`.strip
11
+
12
+ $stderr.puts "Changes Compose: #{dc_folder}, git root: #{git_root}, CI_COMMIT_BEFORE_SHA: #{ENV['CI_COMMIT_BEFORE_SHA']}, CI_COMMIT_SHA: #{ENV['CI_COMMIT_SHA']}"
13
+
14
+ changed_files = `git diff --name-only $CI_COMMIT_BEFORE_SHA $CI_COMMIT_SHA`.split("\n").map(&:strip).delete_if(&:empty?)
15
+ $stderr.puts "Changed Files:"
16
+ changed_files.each { |file| $stderr.puts "\t#{file}" }
11
17
 
12
18
  compose['services'].each do |service_name, service|
13
19
  next unless service['build']
@@ -16,14 +22,18 @@ BuildLabels::CommandLine::COMMANDS[:changed] = Class.new do
16
22
  ad = service.dig('build','additional_contexts') || []
17
23
  ad = ad.class == Hash ? ad.values : ad.map{_1[/=(.*)/,1]}
18
24
  contexts = [service.dig('build','context')] + ad
19
- contexts = contexts.flatten.compact.map{File::absolute_path(dc_folder + '/' + _1) + '/' }
25
+ contexts = contexts.flatten.compact.map{File::absolute_path(git_root + '/' + _1) + '/' }
20
26
  contexts << File::absolute_path(service.dig('build','dockerfile'))
21
27
 
22
28
 
23
29
  should_build = contexts.any? do |path|
24
- $stderr.puts "Checking #{path} for changes..."
30
+ $stderr.puts "Checking '#{path}' for changes..."
25
31
  Dir.chdir path do
26
- files = `git diff --name-only $CI_COMMIT_BEFORE_SHA $CI_COMMIT_SHA`.split("\n").map(&:strip).delete_if(:empty?)
32
+ files = changed_files.map{ File::absolute_path(ch_folder + '/' + _1) }
33
+ .select {
34
+ $stdout.puts "cmp #{_1} == #{path} "
35
+ _1.index(path) == 0
36
+ }
27
37
 
28
38
  if files.any?
29
39
  $stderr.puts "changes found:"
data/lib/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module BuildLabels
2
2
  class Builder
3
- VERSION = '0.0.60'
3
+ VERSION = '0.0.62'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: build-labels
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.60
4
+ version: 0.0.62
5
5
  platform: ruby
6
6
  authors:
7
7
  - Artyom B