Skip to content

Commit 88b6f69

Browse files
committed
Bump version by one minor for pre-releases
1 parent e71d162 commit 88b6f69

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

Taskfile.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ env:
44
BUNDLE_PATH: .vendor
55

66
vars:
7-
VERSION:
7+
GIT_DESCRIBE:
88
sh: git describe --tags --dirty --always
99
GEM_VERSION:
10-
sh: ruby -e "puts Gem::Version.new(ARGV[0].split('-')[0] + '-' + ARGV[0].split('-')[1..].join('.'))" {{.VERSION}}
10+
sh: ruby -e "if Gem::Version.new(ARGV[0]).prerelease? then puts Gem::Version.new(Gem::Version.new(ARGV[0].split('-')[0]).bump().to_s + '-' + ARGV[0].split('-')[1..].join('.')) else puts Gem::Version.new(ARGV[0]) end" {{.GIT_DESCRIBE}}
1111
GEM_NAME: jekyll-rdf
1212
DOCKER_IMAGE: aksw/jekyll-rdf
1313

@@ -22,7 +22,7 @@ tasks:
2222
desc: Output some variables
2323
cmds:
2424
- |
25-
echo "VERSION: {{.VERSION}}"
25+
echo "GIT_DESCRIBE: {{.GIT_DESCRIBE}}"
2626
echo "GEM_VERSION: {{.GEM_VERSION}}"
2727
echo "GEM_NAME: {{.GEM_NAME}}"
2828
echo "DOCKER_IMAGE: {{.DOCKER_IMAGE}}"
@@ -45,7 +45,7 @@ tasks:
4545
docker:build:
4646
desc: The list of all defined tasks
4747
cmds:
48-
- docker build --no-cache --build-arg VERSION={{.VERSION}} -t {{.DOCKER_IMAGE}}:{{.VERSION}} .
48+
- docker build --no-cache --build-arg VERSION={{.GEM_VERSION}} -t {{.DOCKER_IMAGE}}:{{.GEM_VERSION}} .
4949

5050
test:
5151
desc: Run the tests

jekyll-rdf.gemspec

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,12 @@ RELEASE_VERSION = case
33
when ENV['VERSION'] then ENV['VERSION']
44
else
55
version = `git describe --tags --dirty --always`
6-
version.split('-')[0] + '-' + version.split('-')[1..].join('.')
6+
# if Gem::Version.new(ARGV[0]).prerelease? then puts Gem::Version.new(Gem::Version.new(ARGV[0].split('-')[0]).bump().to_s + '-' + ARGV[0].split('-')[1..].join('.')) else puts Gem::Version.new(ARGV[0]) end
7+
if Gem::Version.new(version).prerelease? then
8+
Gem::Version.new(Gem::Version.new(version.split('-')[0]).bump().to_s + '-' + version.split('-')[1..].join('.'))
9+
else
10+
Gem::Version.new(version)
11+
end
712
end
813

914
Gem::Specification.new do |s|

0 commit comments

Comments
 (0)