From b044cbeb63375e589379939d6b1178312c6235e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?KMY=EF=BC=88=E9=9B=AA=E3=81=82=E3=81=99=E3=81=8B=EF=BC=89?=
 <tt@kmycode.net>
Date: Fri, 12 Jan 2024 09:35:17 +0900
Subject: [PATCH] =?UTF-8?q?Add:=20#391=20=E9=96=8B=E7=99=BA=E4=B8=AD?=
 =?UTF-8?q?=E3=81=AE=E3=83=96=E3=83=A9=E3=83=B3=E3=83=81=E3=81=AB=E3=83=99?=
 =?UTF-8?q?=E3=83=BC=E3=82=BF=E7=89=88=E3=81=AE=E3=83=90=E3=83=BC=E3=82=B8?=
 =?UTF-8?q?=E3=83=A7=E3=83=B3=E8=A1=A8=E8=A8=98=E3=81=8C=E3=81=A7=E3=81=8D?=
 =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E6=95=B4=E5=82=99=E3=83=BBBump=20ve?=
 =?UTF-8?q?rsion=20to=2011.0-dev=20(#447)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add: #391 開発中のブランチにベータ版のバージョン表記ができるよう整備・Bump version to 11.0-dev

* Fix test
---
 app/services/software_update_check_service.rb      |  1 +
 lib/mastodon/version.rb                            | 14 ++++++++++++--
 .../services/software_update_check_service_spec.rb |  2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/services/software_update_check_service.rb b/app/services/software_update_check_service.rb
index 2bb2b6efed..8c95ca546e 100644
--- a/app/services/software_update_check_service.rb
+++ b/app/services/software_update_check_service.rb
@@ -34,6 +34,7 @@ class SoftwareUpdateCheckService < BaseService
     if ENV.fetch('UPDATE_CHECK_SOURCE', 'kmyblue') == 'kmyblue'
       @version = "#{Mastodon::Version.kmyblue_major}.#{Mastodon::Version.kmyblue_minor}"
       @version += '-lts' if Setting.check_lts_version_only
+      @version += '-dev' if Mastodon::Version.dev?
     else
       @version = Mastodon::Version.to_s.split('+')[0]
     end
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 007c768cdd..7ca337cd3d 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -5,7 +5,7 @@ module Mastodon
     module_function
 
     def kmyblue_major
-      10
+      11
     end
 
     def kmyblue_minor
@@ -13,7 +13,9 @@ module Mastodon
     end
 
     def kmyblue_flag
-      nil # 'LTS'
+      # 'LTS'
+      'dev'
+      # nil
     end
 
     def major
@@ -80,6 +82,14 @@ module Mastodon
                        end
     end
 
+    def lts?
+      kmyblue_flag == 'LTS'
+    end
+
+    def dev?
+      kmyblue_flag == 'dev'
+    end
+
     def repository
       ENV.fetch('GITHUB_REPOSITORY', 'kmycode/mastodon')
     end
diff --git a/spec/services/software_update_check_service_spec.rb b/spec/services/software_update_check_service_spec.rb
index 7cc99bb09c..846cbdb709 100644
--- a/spec/services/software_update_check_service_spec.rb
+++ b/spec/services/software_update_check_service_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe SoftwareUpdateCheckService, type: :service do
   subject { described_class.new }
 
   shared_examples 'when the feature is enabled' do
-    let(:full_update_check_url) { "#{update_check_url}?version=#{Mastodon::Version.kmyblue_major}.#{Mastodon::Version.kmyblue_minor}-lts" }
+    let(:full_update_check_url) { "#{update_check_url}?version=#{Mastodon::Version.kmyblue_major}.#{Mastodon::Version.kmyblue_minor}-lts#{Mastodon::Version.dev? ? '-dev' : ''}" }
 
     let(:devops_role)     { Fabricate(:user_role, name: 'DevOps', permissions: UserRole::FLAGS[:view_devops]) }
     let(:owner_user)      { Fabricate(:user, role: UserRole.find_by(name: 'Owner')) }