From 0b01fe8901b7dcf600d50452473c903b1ae23d4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20=C4=8Cupi=C4=87?= Date: Wed, 27 Sep 2017 15:44:10 +0200 Subject: [PATCH] gitlab-runner: renamed from gitlab-ci-multi-runner --- Aliases/gitlab-ci-multi-runner | 1 + ...ab-ci-multi-runner.rb => gitlab-runner.rb} | 21 +++++++++---------- formula_renames.json | 1 + 3 files changed, 12 insertions(+), 11 deletions(-) create mode 120000 Aliases/gitlab-ci-multi-runner rename Formula/{gitlab-ci-multi-runner.rb => gitlab-runner.rb} (84%) diff --git a/Aliases/gitlab-ci-multi-runner b/Aliases/gitlab-ci-multi-runner new file mode 120000 index 00000000000..89fe56a75ec --- /dev/null +++ b/Aliases/gitlab-ci-multi-runner @@ -0,0 +1 @@ +../Formula/gitlab-runner.rb \ No newline at end of file diff --git a/Formula/gitlab-ci-multi-runner.rb b/Formula/gitlab-runner.rb similarity index 84% rename from Formula/gitlab-ci-multi-runner.rb rename to Formula/gitlab-runner.rb index e86110c917a..3d25fd04065 100644 --- a/Formula/gitlab-ci-multi-runner.rb +++ b/Formula/gitlab-runner.rb @@ -1,12 +1,12 @@ require "language/go" -class GitlabCiMultiRunner < Formula +class GitlabRunner < Formula desc "The official GitLab CI runner written in Go" - homepage "https://gitlab.com/gitlab-org/gitlab-ci-multi-runner" - url "https://gitlab.com/gitlab-org/gitlab-ci-multi-runner.git", + homepage "https://gitlab.com/gitlab-org/gitlab-runner" + url "https://gitlab.com/gitlab-org/gitlab-runner.git", :tag => "v9.5.0", :revision => "413da38a72634601bf435f6215d6669cd5a4e40e" - head "https://gitlab.com/gitlab-org/gitlab-ci-multi-runner.git" + head "https://gitlab.com/gitlab-org/gitlab-runner.git" bottle do cellar :any_skip_relocation @@ -40,7 +40,7 @@ class GitlabCiMultiRunner < Formula def install ENV["GOPATH"] = buildpath - dir = buildpath/"src/gitlab.com/gitlab-org/gitlab-ci-multi-runner" + dir = buildpath/"src/gitlab.com/gitlab-org/gitlab-runner" dir.install buildpath.children ENV.prepend_create_path "PATH", buildpath/"bin" Language::Go.stage_deps resources, buildpath/"src" @@ -58,25 +58,24 @@ class GitlabCiMultiRunner < Formula "prebuilt-x86_64.tar.xz", "prebuilt-arm.tar.xz" - proj = "gitlab.com/gitlab-org/gitlab-ci-multi-runner" + proj = "gitlab.com/gitlab-org/gitlab-runner" commit = Utils.popen_read("git", "rev-parse", "--short", "HEAD").chomp branch = version.to_s.split(".")[0..1].join("-") + "-stable" built = Time.new.strftime("%Y-%m-%dT%H:%M:%S%:z") system "go", "build", "-ldflags", <<-EOS.undent - -X #{proj}/common.NAME=gitlab-ci-multi-runner + -X #{proj}/common.NAME=gitlab-runner -X #{proj}/common.VERSION=#{version} -X #{proj}/common.REVISION=#{commit} -X #{proj}/common.BRANCH=#{branch} -X #{proj}/common.BUILT=#{built} EOS - bin.install "gitlab-ci-multi-runner" - bin.install_symlink bin/"gitlab-ci-multi-runner" => "gitlab-runner" + bin.install "gitlab-runner" prefix.install_metafiles end end - plist_options :manual => "gitlab-ci-multi-runner start" + plist_options :manual => "gitlab-runner start" def plist; <<-EOS.undent @@ -91,7 +90,7 @@ class GitlabCiMultiRunner < Formula #{plist_name} ProgramArguments - #{opt_bin}/gitlab-ci-multi-runner + #{opt_bin}/gitlab-runner run --working-directory #{ENV["HOME"]} diff --git a/formula_renames.json b/formula_renames.json index b0b4e7b1bc9..17e4e4c54d3 100644 --- a/formula_renames.json +++ b/formula_renames.json @@ -48,6 +48,7 @@ "gcc5": "gcc@5", "gcc6": "gcc@6", "geode": "apache-geode", + "gitlab-ci-multi-runner": "gitlab-runner", "giflib5": "giflib@5", "giflib@5": "giflib", "glfw2": "glfw@2",