admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #7091 from EricFromCanada/version-stable

Browse Source 
version: handle -stable in tag
This commit is contained in:
Mike McQuaid 2020-03-02 13:20:58 +00:00 committed by GitHub
commit 15d274bab7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/test/language/node_spec.rb
View File

@ -6,7 +6,7 @@ describe Language::Node do
describe "#setup_npm_environment" do describe "#setup_npm_environment" do
it "calls prepend_path when node formula exists only during the first call" do it "calls prepend_path when node formula exists only during the first call" do
node = formula "node" do node = formula "node" do
url "node-test" url "node-test-v1.0"
end end
stub_formula_loader(node) stub_formula_loader(node)
expect(ENV).to receive(:prepend_path) expect(ENV).to receive(:prepend_path)

2
Library/Homebrew/test/version_spec.rb
View File

@ -686,7 +686,7 @@ describe Version do
specify "from tag" do specify "from tag" do
expect(described_class.create("1.2.3")) expect(described_class.create("1.2.3"))
.to be_detected_from("https://github.com/foo/bar.git", tag: "v1.2.3") .to be_detected_from("https://github.com/foo/bar.git", tag: "v1.2.3-stable")
end end
specify "beta from tag" do specify "beta from tag" do

4
Library/Homebrew/version.rb
View File

@ -336,11 +336,11 @@ class Version
return m.captures.first unless m.nil? return m.captures.first unless m.nil?
# e.g. https://www.openssl.org/source/openssl-0.9.8s.tar.gz # e.g. https://www.openssl.org/source/openssl-0.9.8s.tar.gz
m = /-v?([^-]+)/.match(stem) m = /-v?(\d[^-]+)/.match(stem)
return m.captures.first unless m.nil? return m.captures.first unless m.nil?
# e.g. astyle_1.23_macosx.tar.gz # e.g. astyle_1.23_macosx.tar.gz
m = /_([^_]+)/.match(stem) m = /_v?(\d[^_]+)/.match(stem)
return m.captures.first unless m.nil? return m.captures.first unless m.nil?
# e.g. http://mirrors.jenkins-ci.org/war/1.486/jenkins.war # e.g. http://mirrors.jenkins-ci.org/war/1.486/jenkins.war