diff --git a/.github/workflows/patch-release-version-bump.yml b/.github/workflows/patch-release-version-bump.yml index 7adfb7617ea8a..7625e7b4f27e6 100644 --- a/.github/workflows/patch-release-version-bump.yml +++ b/.github/workflows/patch-release-version-bump.yml @@ -4,11 +4,11 @@ on: inputs: MAJOR_VERSION: type: choice - description: 'Major version (current)' + description: 'Major version' options: ['7', '8'] MINOR_VERSION: type: choice - description: 'Minor version (current)' + description: 'Minor version' options: ['12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23', '24', '25'] PATCH_VERSION: type: choice diff --git a/integtest/spec/all_books_change_detection_spec.rb b/integtest/spec/all_books_change_detection_spec.rb index 964585b9e3d00..0a562063bcf94 100644 --- a/integtest/spec/all_books_change_detection_spec.rb +++ b/integtest/spec/all_books_change_detection_spec.rb @@ -196,16 +196,14 @@ def self.build_one_book_then_two_books( shared_examples 'toc and version drop down' do shared_examples 'correct' do context 'the version drop down' do - let(:master_current) { current == 'master' ? ' (current)' : '' } let(:master_option) do <<~HTML.strip - + HTML end - let(:foo_current) { current == 'foo' ? ' (current)' : '' } let(:foo_option) do <<~HTML.strip - + HTML end it 'contains all versions' do diff --git a/integtest/spec/all_books_spec.rb b/integtest/spec/all_books_spec.rb index 9a4164769f8a4..2ca0c81f95fd3 100644 --- a/integtest/spec/all_books_spec.rb +++ b/integtest/spec/all_books_spec.rb @@ -625,14 +625,14 @@ def self.setup_example(repo, lang, hash) context 'the live versions drop down' do it 'contains only the live branches' do expect(body).to include(<<~HTML.strip) - + HTML end end context 'the other versions drop down' do it 'contains all branches' do expect(body).to include(<<~HTML.strip) - other versions: + other versions: HTML end end @@ -662,14 +662,14 @@ def self.setup_example(repo, lang, hash) context 'the live versions drop down' do it 'contains only the live branches' do expect(body).to include(<<~HTML.strip) - + HTML end end context 'the other versions drop down' do it 'contains all branches' do expect(body).to include(<<~HTML.strip) - other versions: + other versions: HTML end end @@ -695,14 +695,14 @@ def self.setup_example(repo, lang, hash) context 'the live versions drop down' do it 'contains only the live branches' do expect(body).to include(<<~HTML.strip) - + HTML end end context 'the other versions drop down' do it 'contains all branches' do expect(body).to include(<<~HTML.strip) - other versions: + other versions: HTML end end @@ -734,14 +734,14 @@ def self.setup_example(repo, lang, hash) context 'the live versions drop down' do it 'contains the deprecated branch' do expect(body).to include(<<~HTML.strip) - HTML end end context 'the other versions drop down' do it 'contains all branches' do expect(body).to include(<<~HTML.strip) - other versions: + other versions: HTML end end diff --git a/lib/ES/Book.pm b/lib/ES/Book.pm index 9ef7552154bff..81b18c434eef7 100644 --- a/lib/ES/Book.pm +++ b/lib/ES/Book.pm @@ -202,21 +202,14 @@ sub build { $latest = 0; my $version = $self->branch_title($branch); - if ( $branch eq $self->current ) { # TODO: when "current" is a version, change this. - $toc->add_entry( - { title => "$title: $version (current)", - url => "current/index.html" - } - ); + $toc->add_entry( + { title => "$title: $version", + url => "$version/index.html" + } + ); + if ( $branch eq $self->current ) { $rebuilding_current_branch = $building; } - else { - $toc->add_entry( - { title => "$title: $version", - url => "$version/index.html" - } - ); - } } $pm->wait_all_children(); $self->_copy_branch_to_current if $rebuilding_current_branch; @@ -372,7 +365,6 @@ sub _update_title_and_version_drop_downs { $title .= ''; } $title .= '' if $removed_any; @@ -385,7 +377,6 @@ sub _update_title_and_version_drop_downs { $title .= ''; } $title .= '';