Merge pull request #15 from dazzl-tv/bugfix/versionning-deploy

Bugfix/versionning deploy
dazzl-tv · Sep 23, 2021 · 5f0dc13 · 5f0dc13
2 parents e2e9e60 + 42d59c4
commit 5f0dc13
Show file tree

Hide file tree

Showing 13 changed files with 2 additions and 239 deletions.
diff --git a/.travis/default.yml b/.travis/default.yml
diff --git a/.travis/janus.1.cfg b/.travis/janus.1.cfg
diff --git a/.travis/janus.1.dockerfile b/.travis/janus.1.dockerfile
diff --git a/.travis/janus.1.jcfg b/.travis/janus.1.jcfg
diff --git a/.travis/janus.1.transport.rabbitmq.cfg b/.travis/janus.1.transport.rabbitmq.cfg
diff --git a/.travis/janus.1.transport.rabbitmq.jcfg b/.travis/janus.1.transport.rabbitmq.jcfg
diff --git a/.travis/janus.2.cfg b/.travis/janus.2.cfg
diff --git a/.travis/janus.2.dockerfile b/.travis/janus.2.dockerfile
diff --git a/.travis/janus.2.jcfg b/.travis/janus.2.jcfg
diff --git a/.travis/janus.2.transport.rabbitmq.cfg b/.travis/janus.2.transport.rabbitmq.cfg
diff --git a/.travis/janus.2.transport.rabbitmq.jcfg b/.travis/janus.2.transport.rabbitmq.jcfg
diff --git a/.travis/rspec.rb b/.travis/rspec.rb
diff --git a/ruby_rabbitmq_janus.gemspec b/ruby_rabbitmq_janus.gemspec
@@ -7,7 +7,8 @@ require 'rrj/info'
 
 Gem::Specification.new do |spec|
   version = RubyRabbitmqJanus::VERSION
-  spec.version       = if ENV.key?('GITHUB_RUN_ID')
+  spec.version       = if ENV.key?('GITHUB_RUN_ID') &&
+                          !ENV['GITHUB_REF'].eql?('refs/heads/master')
                          "#{version}.pre.#{ENV['GITHUB_RUN_ID']}"
                        else
                          version