From ac652d82f17d378e485dcef15a8fabdcf9bad76b Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Thu, 14 Jan 2016 19:45:43 +0100
Subject: Let the CI runner know about builds that this build depends on

This allows us to implement artifacts passing: runner will download artifacts from all prior builds
---
 lib/ci/api/builds.rb   |  4 ++--
 lib/ci/api/entities.rb | 19 +++++++++++++++----
 2 files changed, 17 insertions(+), 6 deletions(-)

(limited to 'lib')

diff --git a/lib/ci/api/builds.rb b/lib/ci/api/builds.rb
index fb87637b94f..690bbf97a89 100644
--- a/lib/ci/api/builds.rb
+++ b/lib/ci/api/builds.rb
@@ -20,7 +20,7 @@ module Ci
 
           if build
             update_runner_info
-            present build, with: Entities::Build
+            present build, with: Entities::BuildDetails
           else
             not_found!
           end
@@ -111,7 +111,7 @@ module Ci
           build.artifacts_metadata = metadata
 
           if build.save
-            present(build, with: Entities::Build)
+            present(build, with: Entities::BuildDetails)
           else
             render_validation_error!(build)
           end
diff --git a/lib/ci/api/entities.rb b/lib/ci/api/entities.rb
index e4ac0545ea2..835f8c97021 100644
--- a/lib/ci/api/entities.rb
+++ b/lib/ci/api/entities.rb
@@ -16,10 +16,19 @@ module Ci
       end
 
       class Build < Grape::Entity
-        expose :id, :commands, :ref, :sha, :status, :project_id, :repo_url,
-          :before_sha, :allow_git_fetch, :project_name
-
+        expose :id, :ref, :tag, :sha, :status
         expose :name, :token, :stage
+        expose :project_id
+        expose :project_name
+        expose :artifacts_file, using: ArtifactFile, if: lambda { |build, opts| build.artifacts_file.exists? }
+      end
+
+      class BuildDetails < Build
+        expose :commands
+        expose :repo_url
+        expose :before_sha
+        expose :allow_git_fetch
+        expose :token
 
         expose :options do |model|
           model.options
@@ -30,7 +39,9 @@ module Ci
         end
 
         expose :variables
-        expose :artifacts_file, using: ArtifactFile
+        expose :dependencies do
+          expose :depends_on_builds, as: :builds, using: Build
+        end
       end
 
       class Runner < Grape::Entity
-- 
cgit v1.2.1


From 1ce766367eb529fe88068be2f34315f87d74a349 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Fri, 15 Jan 2016 15:35:33 +0100
Subject: Change dependencies.builds to depends_on_builds

---
 lib/ci/api/entities.rb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/ci/api/entities.rb b/lib/ci/api/entities.rb
index 835f8c97021..b25e0e573a8 100644
--- a/lib/ci/api/entities.rb
+++ b/lib/ci/api/entities.rb
@@ -20,7 +20,7 @@ module Ci
         expose :name, :token, :stage
         expose :project_id
         expose :project_name
-        expose :artifacts_file, using: ArtifactFile, if: lambda { |build, opts| build.artifacts_file.exists? }
+        expose :artifacts_file, using: ArtifactFile, if: lambda { |build, opts| build.artifacts? }
       end
 
       class BuildDetails < Build
@@ -39,9 +39,7 @@ module Ci
         end
 
         expose :variables
-        expose :dependencies do
-          expose :depends_on_builds, as: :builds, using: Build
-        end
+        expose :depends_on_builds, using: Build
       end
 
       class Runner < Grape::Entity
-- 
cgit v1.2.1