Skip to content

Commit

Permalink
set release-version attribute to gem version during release; fix bug …
Browse files Browse the repository at this point in the history
…in version script [no ci]
  • Loading branch information
mojavelinux committed May 18, 2023
1 parent 6827956 commit f7851aa
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.adoc
Expand Up @@ -64,7 +64,7 @@ Build / Infrastructure::

=== Details

{url-repo}/releases/tag/v2.0.19[git tag] | {url-repo}/compare/v2.0.18\...v2.0.19[source diff]
{url-repo}/releases/tag/v2.0.19[git tag] | {url-repo}/compare/v2.0.18\...v2.0.19[full diff]
// end::compact[]

== 2.0.18 (2022-10-15) - @mojavelinux
Expand All @@ -89,7 +89,7 @@ Bug Fixes::

=== Details

{url-repo}/releases/tag/v2.0.18[git tag] | {url-repo}/compare/v2.0.17\...v2.0.18[source diff]
{url-repo}/releases/tag/v2.0.18[git tag] | {url-repo}/compare/v2.0.17\...v2.0.18[full diff]

== 2.0.17 (2022-01-05) - @mojavelinux

Expand Down
8 changes: 5 additions & 3 deletions tasks/version.rb
Expand Up @@ -4,6 +4,7 @@
require_relative '../lib/asciidoctor'

release_version = ENV['RELEASE_VERSION']
release_gem_version = ENV['RELEASE_GEM_VERSION']
prerelease = (release_version.count '[a-z]') > 0 ? %(-#{(release_version.split '.', 3)[-1]}) : nil
release_date = Time.now.strftime '%Y-%m-%d'
release_user = ENV['RELEASE_USER']
Expand All @@ -14,12 +15,12 @@
antora_file = 'docs/antora.yml'

version_contents = (File.readlines version_file, mode: 'r:UTF-8').map do |l|
(l.include? 'VERSION') ? (l.sub %r/'[^']+'/, %('#{release_version}')) : l
(l.include? 'VERSION') ? (l.sub %r/'[^']+'/, %('#{release_gem_version}')) : l
end

readme_files = readme_files.map do |readme_file|
readme_contents = (File.readlines readme_file, mode: 'r:UTF-8').map do |l|
(l.start_with? ':release-version: ') ? %(:release-version: #{release_version}\n) : l
(l.start_with? ':release-version: ') ? %(:release-version: #{release_gem_version}\n) : l
end
if readme_file.include? 'README'
if readme_contents[2].start_with? 'v'
Expand All @@ -37,12 +38,13 @@
if (last_release_idx = changelog_contents.index {|l| (l.start_with? '== ') && (%r/^== \d/.match? l) })
previous_release_version = (changelog_contents[last_release_idx].match %r/\d\S+/)[0]
else
changelog_contents << ?\n
last_release_idx = changelog_contents.length
end
changelog_contents.insert last_release_idx, <<~END
=== Details
{url-repo}/releases/tag/v#{release_version}[git tag]#{previous_release_version ? %( | {url-repo}/compare/v#{previous_release_version}\\...v#{release_version}[source diff]) : ''}
{url-repo}/releases/tag/v#{release_version}[git tag]#{previous_release_version ? %( | {url-repo}/compare/v#{previous_release_version}\\...v#{release_version}[full diff]) : ''}
// end::compact[]
END
Expand Down

0 comments on commit f7851aa

Please sign in to comment.