A platform for community discussion. Free, open, simple.
FIX: Accept `-latest` builds in theme version constraints (#43459)
David Taylor3a3fde56fd72
diff --git a/lib/version_compatibility.rb b/lib/version_compatibility.rbindex eb0a1558cf5..0112c6c8ee7 100644--- a/lib/version_compatibility.rb+++ b/lib/version_compatibility.rb@@ -1,7 +1,7 @@# frozen_string_literal: truemodule Discourse- VERSION_REGEXP = /\A\d+\.\d+\.\d+(\.beta\d+)?\z/+ VERSION_REGEXP = /\A\d+\.\d+\.\d+(\.beta\d+|-latest(\.\d+)?)?\z/VERSION_COMPATIBILITY_FILENAME = ".discourse-compatibility"class InvalidVersionListError < StandardErrordiff --git a/spec/lib/version_compatibility_spec.rb b/spec/lib/version_compatibility_spec.rbindex 0ecd6cee2e6..72849fbaae1 100644--- a/spec/lib/version_compatibility_spec.rb+++ b/spec/lib/version_compatibility_spec.rb@@ -41,6 +41,28 @@ RSpec.describe Discourse doexpect(Discourse.has_needed_version?("1.3.0.beta4", "1.3.0.beta3")).to eq(true)expect(Discourse.has_needed_version?("1.3.0", "1.3.0.beta3")).to eq(true)end++ it "treats -latest builds as pre-releases of the same version" do+ expect(Discourse.has_needed_version?("2026.8.0-latest", "2026.7.2")).to eq(true)+ expect(Discourse.has_needed_version?("2026.8.0-latest.1", "2026.8.0-latest")).to eq(true)+ expect(Discourse.has_needed_version?("2026.8.0", "2026.8.0-latest.1")).to eq(true)+ expect(Discourse.has_needed_version?("2026.8.0-latest", "2026.8.0-latest.1")).to eq(false)+ expect(Discourse.has_needed_version?("2026.8.0-latest.1", "2026.8.0")).to eq(false)+ end+ end++ describe "VERSION_REGEXP" do+ it "matches release, beta and -latest versions" do+ %w[2026.8.0 1.3.0.beta3 2026.8.0-latest 2026.8.0-latest.1].each do |v|+ expect(v).to match(Discourse::VERSION_REGEXP)+ end+ end++ it "rejects other suffixes" do+ %w[2026.8 2026.8.0-beta 2026.8.0-latest. 2026.8.0-latest.1.2 2026.8.0latest].each do |v|+ expect(v).not_to match(Discourse::VERSION_REGEXP)+ end+ endenddescribe ".find_compatible_resource" dodiff --git a/spec/models/remote_theme_spec.rb b/spec/models/remote_theme_spec.rbindex b3b3197dc44..08c58321d2e 100644--- a/spec/models/remote_theme_spec.rb+++ b/spec/models/remote_theme_spec.rb@@ -700,6 +700,24 @@ RSpec.describe RemoteTheme doendend+ describe "version validations" do+ it "accepts -latest versions" do+ remote = RemoteTheme.new(minimum_discourse_version: "2026.8.0-latest")+ remote.validate+ expect(remote.errors[:minimum_discourse_version]).to be_empty++ remote = RemoteTheme.new(maximum_discourse_version: "2026.8.0-latest.1")+ remote.validate+ expect(remote.errors[:maximum_discourse_version]).to be_empty+ end++ it "rejects malformed versions" do+ remote = RemoteTheme.new(minimum_discourse_version: "2026.8.0-nightly")+ remote.validate+ expect(remote.errors[:minimum_discourse_version]).to be_present+ end+ end+describe ".extract_theme_info" dolet(:importer) { mock }