Drop repository and revision property for Ninja and CMake
Turned out these aren't needed after all, the problem was invalid
URL for the Ninja Git repository.
Change-Id: I8ba9cfcc938c27f75f83aaa58272ad9f013c0914
diff --git a/recipes/cmake.py b/recipes/cmake.py
index 724a4c6..255f785 100644
--- a/recipes/cmake.py
+++ b/recipes/cmake.py
@@ -4,7 +4,6 @@
"""Recipe for building CMake."""
from PB.go.chromium.org.luci.common.proto.srcman.manifest import Manifest
-from recipe_engine.recipe_api import Property
from google.protobuf import json_format
@@ -28,32 +27,20 @@
GIT_URL = 'https://fuchsia.googlesource.com/third_party/github.com/Kitware/CMake'
CIPD_SERVER_HOST = 'chrome-infra-packages.appspot.com'
-PROPERTIES = {
- 'repository':
- Property(
- kind=str,
- help='Git repository URL',
- default=GIT_URL,
- ),
- 'revision':
- Property(kind=str, help='Git revision', default=None),
-}
-
def RunSteps(api):
manifest = Manifest()
with api.step.nest('checkout sources'), api.context(infra_steps=True):
gitiles_commit = api.buildbucket.build_input.gitiles_commit
- if gitiles_commit.host and gitiles_commit.project and gitiles_commit.id:
- repository = 'https://%s/%s' % (gitiles_commit.host,
- gitiles_commit.project)
- revision = gitiles_commit.id
+ url = ('https://%s/%s' % (gitiles_commit.host, gitiles_commit.project)
+ if gitiles_commit.host and gitiles_commit.project else GIT_URL)
+ ref = gitiles_commit.id
src_dir = api.path['start_dir'].join('cmake')
- revision = api.git.checkout(repository, path=src_dir, ref=revision)
+ revision = api.git.checkout(url, path=src_dir, ref=ref)
git_checkout = manifest.directories[str(src_dir)].git_checkout
- git_checkout.repo_url = repository
+ git_checkout.repo_url = url
git_checkout.revision = revision
with api.step.nest('ensure packages'), api.context(infra_steps=True):
@@ -140,7 +127,7 @@
'fuchsia/third_party/cmake/${platform}',
pkg_dir, [api.upload.DirectoryPath(pkg_dir)],
{'git_revision': revision},
- repository=repository,
+ repository=url,
extra_tags={'version': cmake_version})
diff --git a/recipes/ninja.py b/recipes/ninja.py
index 2ce5056..9e68807 100644
--- a/recipes/ninja.py
+++ b/recipes/ninja.py
@@ -4,7 +4,6 @@
"""Recipe for building Ninja."""
from PB.go.chromium.org.luci.common.proto.srcman.manifest import Manifest
-from recipe_engine.recipe_api import Property
from google.protobuf import json_format
@@ -24,35 +23,23 @@
'recipe_engine/step',
]
-GIT_URL = 'fuchsia.googlesource.com/third_party/github.com/ninja-build/ninja'
+GIT_URL = 'https://fuchsia.googlesource.com/third_party/github.com/ninja-build/ninja'
CIPD_SERVER_HOST = 'chrome-infra-packages.appspot.com'
-PROPERTIES = {
- 'repository':
- Property(
- kind=str,
- help='Git repository URL',
- default=GIT_URL,
- ),
- 'revision':
- Property(kind=str, help='Git revision', default=None),
-}
-
-def RunSteps(api, repository, revision):
+def RunSteps(api):
manifest = Manifest()
with api.step.nest('checkout sources'), api.context(infra_steps=True):
gitiles_commit = api.buildbucket.build_input.gitiles_commit
- if gitiles_commit.host and gitiles_commit.project and gitiles_commit.id:
- repository = 'https://%s/%s' % (gitiles_commit.host,
- gitiles_commit.project)
- revision = gitiles_commit.id
+ url = ('https://%s/%s' % (gitiles_commit.host, gitiles_commit.project)
+ if gitiles_commit.host and gitiles_commit.project else GIT_URL)
+ ref = gitiles_commit.id
src_dir = api.path['start_dir'].join('ninja')
- revision = api.git.checkout(repository, path=src_dir, ref=revision)
+ revision = api.git.checkout(url, path=src_dir, ref=ref)
git_checkout = manifest.directories[str(src_dir)].git_checkout
- git_checkout.repo_url = repository
+ git_checkout.repo_url = url
git_checkout.revision = revision
with api.step.nest('ensure packages'), api.context(infra_steps=True):
@@ -133,7 +120,7 @@
api.upload.cipd_package(
'fuchsia/third_party/ninja/${platform}',
src_dir, [api.upload.FilePath(ninja)], {'git_revision': revision},
- repository=repository,
+ repository=url,
extra_tags={'version': ninja_version})
