From bb9fe5d466bd65688d41fa042c89a61cfb6a5472 Mon Sep 17 00:00:00 2001 From: Thomas Boerger Date: Thu, 29 Dec 2016 12:33:32 +0100 Subject: [PATCH 1/4] Make stable/devel/head installable --- gitea.rb | 5 +++-- lgtm.rb | 7 +++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/gitea.rb b/gitea.rb index 0c03ff0..aeac2e9 100644 --- a/gitea.rb +++ b/gitea.rb @@ -27,7 +27,8 @@ class Gitea < Formula end def install - if build.head? + case + when build.head? mkdir_p buildpath/File.join("src", "code.gitea.io") ln_s buildpath, buildpath/File.join("src", "code.gitea.io", "gitea") @@ -40,7 +41,7 @@ class Gitea < Formula system "cd src/code.gitea.io/gitea && make build" bin.install "#{buildpath}/gitea" => "gitea" - elsif build.devel? + when build.devel? bin.install "#{buildpath}/gitea-master-darwin-10.6-amd64" => "gitea" else bin.install "#{buildpath}/gitea-1.0.0-darwin-10.6-amd64" => "gitea" diff --git a/lgtm.rb b/lgtm.rb index 1311936..9448dc0 100644 --- a/lgtm.rb +++ b/lgtm.rb @@ -28,7 +28,8 @@ class Lgtm < Formula end def install - if build.head? + case + when build.head? mkdir_p buildpath/File.join("src", "github.com", "go-gitea") ln_s buildpath, buildpath/File.join("src", "github.com", "go-gitea", "lgtm") @@ -41,8 +42,10 @@ class Lgtm < Formula system("make", "build") bin.install "#{buildpath}/bin/lgtm" => "lgtm" - else + when build.devel? bin.install "#{buildpath}/lgtm-master-darwin-amd64" => "lgtm" + else + bin.install "#{buildpath}/lgtm-1.0.0-darwin-amd64" => "lgtm" end end end From e513995cd0790bf2bb865eff9bbc046b51edddf9 Mon Sep 17 00:00:00 2001 From: Thomas Boerger Date: Tue, 10 Jan 2017 09:28:29 +0100 Subject: [PATCH 2/4] Use HTTPS and proper build tags --- gitea.rb | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/gitea.rb b/gitea.rb index aeac2e9..bd8cc1a 100644 --- a/gitea.rb +++ b/gitea.rb @@ -5,20 +5,19 @@ class Gitea < Formula head "https://github.com/go-gitea/gitea.git" stable do - url "http://dl.gitea.io/gitea/1.0.0/gitea-1.0.0-darwin-10.6-amd64" - sha256 `curl -Ls http://dl.gitea.io/gitea/1.0.0/gitea-1.0.0-darwin-10.6-amd64.sha256`.split(" ").first + url "https://dl.gitea.io/gitea/1.0.0/gitea-1.0.0-darwin-10.6-amd64" + sha256 `curl -s https://dl.gitea.io/gitea/1.0.0/gitea-1.0.0-darwin-10.6-amd64.sha256`.split(" ").first version "1.0.0" end devel do - url "http://dl.gitea.io/gitea/master/gitea-master-darwin-10.6-amd64" - sha256 `curl -Ls http://dl.gitea.io/gitea/master/gitea-master-darwin-10.6-amd64.sha256`.split(" ").first + url "https://dl.gitea.io/gitea/master/gitea-master-darwin-10.6-amd64" + sha256 `curl -s https://dl.gitea.io/gitea/master/gitea-master-darwin-10.6-amd64.sha256`.split(" ").first version "master" end head do url "https://github.com/go-gitea/gitea.git", :branch => "master" - depends_on "go" => :build end @@ -36,9 +35,9 @@ class Gitea < Formula ENV["GOPATH"] = buildpath ENV["GOHOME"] = buildpath - ENV["TAGS"] = "sqlite" + ENV["TAGS"] = "bindata sqlite tidb" - system "cd src/code.gitea.io/gitea && make build" + system "cd src/code.gitea.io/gitea && make generate build" bin.install "#{buildpath}/gitea" => "gitea" when build.devel? From f09a8bd445e569ae9792fad0abd207f48ab9ec77 Mon Sep 17 00:00:00 2001 From: Thomas Boerger Date: Tue, 10 Jan 2017 09:28:47 +0100 Subject: [PATCH 3/4] Apply same changes as gitea to lgtm --- lgtm.rb | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/lgtm.rb b/lgtm.rb index 9448dc0..0c66706 100644 --- a/lgtm.rb +++ b/lgtm.rb @@ -5,22 +5,20 @@ class Lgtm < Formula head "https://github.com/go-gitea/lgtm.git" stable do - url "http://dl.gitea.io/lgtm/1.0.0/lgtm-1.0.0-darwin-amd64" - sha256 `curl -s http://dl.gitea.io/lgtm/1.0.0/lgtm-1.0.0-darwin-amd64.sha256`.split(" ").first + url "https://dl.gitea.io/lgtm/1.0.0/lgtm-1.0.0-darwin-10.6-amd64" + sha256 `curl -s https://dl.gitea.io/lgtm/1.0.0/lgtm-1.0.0-darwin-10.6-amd64.sha256`.split(" ").first version "1.0.0" end devel do - url "http://dl.gitea.io/lgtm/master/lgtm-master-darwin-amd64" - sha256 `curl -s http://dl.gitea.io/lgtm/master/lgtm-master-darwin-amd64.sha256`.split(" ").first + url "https://dl.gitea.io/lgtm/master/lgtm-master-darwin-10.6-amd64" + sha256 `curl -s https://dl.gitea.io/lgtm/master/lgtm-master-darwin-10.6-amd64.sha256`.split(" ").first version "master" end head do url "https://github.com/go-gitea/lgtm.git", :branch => "master" - depends_on "go" => :build - depends_on "git" => :build end test do @@ -39,13 +37,13 @@ class Lgtm < Formula ENV["GOHOME"] = buildpath ENV["TAGS"] = "" - system("make", "build") + system "cd src/github.com/go-gitea/lgtm && make build" - bin.install "#{buildpath}/bin/lgtm" => "lgtm" + bin.install "#{buildpath}/lgtm" => "lgtm" when build.devel? - bin.install "#{buildpath}/lgtm-master-darwin-amd64" => "lgtm" + bin.install "#{buildpath}/lgtm-master-darwin-10.6-amd64" => "lgtm" else - bin.install "#{buildpath}/lgtm-1.0.0-darwin-amd64" => "lgtm" + bin.install "#{buildpath}/lgtm-1.0.0-darwin-10.6-amd64" => "lgtm" end end end From 1278ab757d5e2c2a6dcf061c76a2240a59676f52 Mon Sep 17 00:00:00 2001 From: Thomas Boerger Date: Tue, 10 Jan 2017 09:29:19 +0100 Subject: [PATCH 4/4] Updated gitea to 1.0.1 --- gitea.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gitea.rb b/gitea.rb index bd8cc1a..c759f61 100644 --- a/gitea.rb +++ b/gitea.rb @@ -5,9 +5,9 @@ class Gitea < Formula head "https://github.com/go-gitea/gitea.git" stable do - url "https://dl.gitea.io/gitea/1.0.0/gitea-1.0.0-darwin-10.6-amd64" - sha256 `curl -s https://dl.gitea.io/gitea/1.0.0/gitea-1.0.0-darwin-10.6-amd64.sha256`.split(" ").first - version "1.0.0" + url "https://dl.gitea.io/gitea/1.0.1/gitea-1.0.1-darwin-10.6-amd64" + sha256 `curl -s https://dl.gitea.io/gitea/1.0.1/gitea-1.0.1-darwin-10.6-amd64.sha256`.split(" ").first + version "1.0.1" end devel do