Fix reusing already built PMD binary in CI

The binary pmd-dist/taget/pmd-bin-x.y.z-SNAPSHOT.zip can be reused in CI builds
but wasn't due to relative paths and wrong search directory.

Author: adangel

History.md

@@ -5,10 +5,8 @@
 ## Fixed Issues
 
 *   [#81](https://github.com/pmd/pmd-regression-tester/pull/81): Dynamically generated rulesets are not applied on diffs
-
-## External Contributions
-
 *   [#82](https://github.com/pmd/pmd-regression-tester/pull/82): Summary hash uses wrong key names
+*   An already built PMD binary was not reused in CI
 
 # 1.1.0 / 2020-12-05
 

lib/pmdtester/builders/pmd_report_builder.rb

@@ -31,9 +31,10 @@ def get_pmd_binary_file
 
         raise "Wrong branch #{get_last_commit_sha}" unless build_branch_sha == get_last_commit_sha
 
+        distro_path = saved_distro_path(build_branch_sha)
         logger.debug "#{@pmd_branch_name}: PMD Version is #{@pmd_version} " \
                      "(sha=#{build_branch_sha})"
-        distro_path = saved_distro_path(build_branch_sha)
+        logger.debug "#{@pmd_branch_name}: distro_path=#{distro_path}"
         if File.directory?(distro_path)
           logger.info "#{@pmd_branch_name}: Skipping packaging - saved version exists " \
                       " in #{distro_path}"
@@ -53,7 +54,9 @@ def build_pmd(into_dir:)
       # in CI there might have been a build performed already. In that case
       # we reuse the build result, otherwise we build PMD freshly
       pmd_dist_target = "pmd-dist/target/pmd-bin-#{@pmd_version}.zip"
-      if File.exist?("#{@local_git_repo}/#{pmd_dist_target}")
+      binary_exists = File.exist?(pmd_dist_target)
+      logger.debug "#{@pmd_branch_name}: Does the file #{pmd_dist_target} exist? #{binary_exists} (cwd: #{Dir.getwd})"
+      if binary_exists
         # that's a warning, because we don't know, whether this build really
         # belongs to the current branch or whether it's from a previous branch.
         # In CI, that's not a problem, because the workspace is always fresh.

test/test_pmd_report_builder.rb

@@ -145,7 +145,6 @@ def record_expectations_project_build(sha1, error = false)
   end
 
   def record_expectations(sha1_head, sha1_base, zip_file_exists)
-    Dir.expects(:chdir).with('target/repositories/pmd').yields.once
     PmdTester::Cmd.stubs(:execute).with('git rev-parse master^{commit}').returns(sha1_base).once
     # inside checkout_build_branch
     PmdTester::Cmd.stubs(:execute).with('git checkout master')