origen 0.60.13 → 0.60.14
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/config/version.rb +1 -1
- data/lib/origen/remote_manager.rb +11 -7
- data/lib/origen/revision_control/git.rb +3 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 72edbb6af81e08f3dae27340b8adb75a2bd0a328e24b398c7c493923e568fff5
|
4
|
+
data.tar.gz: '0711789ba34b72bf554ff6b57af5772229a36dd2d0dbbeae35f307c660c45d78'
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: b30d5368c8ac8c113047ac370d874db601b8b32cdbb6f0f5389b0d44b29140a06d1c782e5198a895b13f22928f45a90bd3c1a79815718c7319ee9b4f83cf7735
|
7
|
+
data.tar.gz: 59c09425ebf952b780a4bd7b6992185b0db5df2e6582bbd5fe9b3ebf4c8121e14783376c5481aec026441612a04f889145c66204d787a7efb1c8f801acb5807c
|
data/config/version.rb
CHANGED
@@ -139,13 +139,13 @@ module Origen
|
|
139
139
|
if File.exist?("#{dir}/.initial_populate_successful")
|
140
140
|
FileUtils.rm_f(version_file) if File.exist?(version_file)
|
141
141
|
rc = RevisionControl.new remote: rc_url, local: dir
|
142
|
-
rc.send rc.remotes_method, version: prefix_tag(tag), force: true
|
142
|
+
rc.send rc.remotes_method, version: prefix_tag(tag, remote), force: true
|
143
143
|
File.open(version_file, 'w') do |f|
|
144
144
|
f.write tag
|
145
145
|
end
|
146
146
|
else
|
147
147
|
rc = RevisionControl.new remote: rc_url, local: dir
|
148
|
-
rc.send rc.remotes_method, version: prefix_tag(tag), force: true
|
148
|
+
rc.send rc.remotes_method, version: prefix_tag(tag, remote), force: true
|
149
149
|
FileUtils.touch "#{dir}/.initial_populate_successful"
|
150
150
|
File.open(version_file, 'w') do |f|
|
151
151
|
f.write tag
|
@@ -342,13 +342,13 @@ module Origen
|
|
342
342
|
if File.exist?("#{dir}/.initial_populate_successful")
|
343
343
|
FileUtils.rm_f(version_file) if File.exist?(version_file)
|
344
344
|
rc = RevisionControl.new remote: rc_url, local: dir
|
345
|
-
rc.send rc.remotes_method, version: prefix_tag(tag), force: true
|
345
|
+
rc.send rc.remotes_method, version: prefix_tag(tag, remote), force: true
|
346
346
|
File.open(version_file, 'w') do |f|
|
347
347
|
f.write tag
|
348
348
|
end
|
349
349
|
else
|
350
350
|
rc = RevisionControl.new remote: rc_url, local: dir
|
351
|
-
rc.send rc.remotes_method, version: prefix_tag(tag), force: true
|
351
|
+
rc.send rc.remotes_method, version: prefix_tag(tag, remote), force: true
|
352
352
|
FileUtils.touch "#{dir}/.initial_populate_successful"
|
353
353
|
File.open(version_file, 'w') do |f|
|
354
354
|
f.write tag
|
@@ -382,10 +382,14 @@ module Origen
|
|
382
382
|
end
|
383
383
|
|
384
384
|
# If the supplied tag looks like a semantic version number, then make sure it has the
|
385
|
-
# 'v' prefix
|
386
|
-
def prefix_tag(tag)
|
385
|
+
# 'v' prefix unless the remote has explicitly disallowed the prefix
|
386
|
+
def prefix_tag(tag, remote = {})
|
387
|
+
remote = {
|
388
|
+
disable_tag_prefix: false
|
389
|
+
}.merge(remote)
|
390
|
+
|
387
391
|
tag = Origen::VersionString.new(tag)
|
388
|
-
if tag.semantic?
|
392
|
+
if tag.semantic? && !remote[:disable_tag_prefix]
|
389
393
|
tag.prefixed
|
390
394
|
else
|
391
395
|
tag
|
@@ -47,7 +47,9 @@ module Origen
|
|
47
47
|
|
48
48
|
version = options[:version] || current_branch
|
49
49
|
|
50
|
-
|
50
|
+
# Not trying to do a VersionString comparison, just determine if the
|
51
|
+
# string literal value of version == HEAD, hence the .to_s call
|
52
|
+
if version.to_s == 'HEAD'
|
51
53
|
puts "Sorry, but you are not currently on a branch and I don't know which branch you want to checkout"
|
52
54
|
puts 'Please supply a branch name as the version to checkout the latest version of it, e.g. origen rc co -v develop'
|
53
55
|
exit 1
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: origen
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.60.
|
4
|
+
version: 0.60.14
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Stephen McGinty
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2024-05-01 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: activesupport
|