Minimal fixes to try to comment on the PR itself

ci.rb

@@ -183,8 +183,8 @@ def get_limits(t_options, t_client, t_repo)
     test_mode = !(ARGV[0] =~ /false/i)
 
     $logger.info "Querying for updated branches"
-    b.query_branches
     b.query_pull_requests
+    b.query_branches
 
     did_daily_task = false
 

lib/build.rb

@@ -32,6 +32,9 @@ def initialize(token, repository, max_age)
     @potential_builds = []
     @max_age = max_age
     github_check_rate_limit(@client.last_response.headers)
+    # Keep a mapping of branch name -> PR number for PRs which are based on non-fork branches
+    # This is only used for providing the GitHub status comment, nothing else
+    @branch_to_pr_number = {}
   end
 
   def query_branches
@@ -66,7 +69,10 @@ def query_branches
             login = branch_details.commit.author.login
           end
 
-          @potential_builds << PotentialBuild.new(@client, @token, @repository, nil, b.commit.sha, b.name, login, nil, nil, nil, nil, nil)
+          associated_pr_num = @branch_to_pr_number.fetch(b.name, nil)
+          pb = PotentialBuild.new(@client, @token, @repository, nil, b.commit.sha, b.name, login, nil, nil, nil, nil, nil)
+          pb.assign_pr_num_for_comment(associated_pr_num)
+          @potential_builds << pb
           $logger.info("Found a branch to add to potential_builds: #{b.name}")
         else
           $logger.info("Skipping potential build (#{b.name}), it hasn't been updated in #{days} days")
@@ -118,6 +124,8 @@ def query_pull_requests
 
           if p.head.repo.full_name == p.base.repo.full_name
             $logger.info("Skipping pull-request originating from head repo: #{p.number}")
+            @branch_to_pr_number[p.head.ref] = p.number
+            $logger.info("  ...but matching branch to pr_number: #{p.head.ref} => #{p.number}")
           else
             $logger.info("Found an external PR to add to potential_builds: #{p.number}")
             @potential_builds << pb

lib/potentialbuild.rb

@@ -84,6 +84,11 @@ def initialize(client, token, repository, tag_name, commit_sha, branch_name, aut
     @valgrind_counters_results = nil
     @perf_counters_results = nil
     @file_sizes = nil
+    @pr_num_for_comment = nil
+  end
+
+  def assign_pr_num_for_comment(pr_num)
+    @pr_num_for_comment = pr_num
   end
 
   def set_as_baseline
@@ -936,7 +941,9 @@ def post_results(compiler, pending)
       end
 
       if !pending && @config.post_results_comment
-        if !@commit_sha.nil? && @repository == @config.repository
+        if !@pr_num_for_comment.nil?
+          github_query(@client) { @client.add_comment(@config.repository, @pr_num_for_comment, github_document) }
+        elsif !@commit_sha.nil? && @repository == @config.repository
           github_query(@client) { @client.create_commit_comment(@config.repository, @commit_sha, github_document) }
         elsif !@pull_id.nil?
           github_query(@client) { @client.add_comment(@config.repository, @pull_id, github_document) }

spec/build_spec.rb

@@ -249,13 +249,16 @@ def configuration
   def pull_request?
     @pr
   end
+  def assign_pr_num_for_comment(pr_num)
+    @pr_num_for_comment = pr_num
+  end
 end
 
 describe 'Build Testing' do
   context 'when calling query_branches' do
     it 'should include branches that are valid and new' do
       allow(Octokit::Client).to receive(:new).and_return(DummyClient2.new)
-      allow(PotentialBuild).to receive(:new).and_return(true)
+      allow(PotentialBuild).to receive(:new).and_return(DummyPotentialBuild.new('dummy'))
       b = Build.new('abcdef', 'spec/resources', 10)
       expect(b.client.branches('', 1).length).to eql 8 # this is the absolute total
       b.query_branches