From 7d7fa55bebc2b2b5cd25eddbfc9d587f63885ca4 Mon Sep 17 00:00:00 2001
From: "Dmitriy.Panov" <Dmitriy.Panov@jetbrains.com>
Date: Tue, 5 May 2020 13:19:22 +0300
Subject: [PATCH] JPS caches: rename argument for clarity

GitOrigin-RevId: 21fd8305657e44f803fd0daf0ce0acb6900a86e2
---
 .../impl/compilation/CompilationOutputsUploader.groovy    | 8 ++++----
 .../impl/compilation/PortableCompilationCache.groovy      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/compilation/CompilationOutputsUploader.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/compilation/CompilationOutputsUploader.groovy
index d06694675283..4b873464b0d0 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/compilation/CompilationOutputsUploader.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/compilation/CompilationOutputsUploader.groovy
@@ -64,7 +64,7 @@ class CompilationOutputsUploader {
     this.updateCommitHistory = updateCommitHistory
   }
 
-  def upload(Boolean publishCaches) {
+  def upload(Boolean publishTeamCityArtifacts) {
     int executorThreadsCount = Runtime.getRuntime().availableProcessors()
     context.messages.info("$executorThreadsCount threads will be used for upload")
     NamedThreadPoolExecutor executor = new NamedThreadPoolExecutor("Jps Output Upload", executorThreadsCount)
@@ -86,7 +86,7 @@ class CompilationOutputsUploader {
         // not to perform any further compilations.
         if (updateCommitHistory) {
         // Upload jps caches started first because of the significant size of the output
-          if (!uploadCompilationCache(publishCaches)) return
+          if (!uploadCompilationCache(publishTeamCityArtifacts)) return
         }
 
         uploadMetadata()
@@ -115,7 +115,7 @@ class CompilationOutputsUploader {
     }
   }
 
-  private boolean uploadCompilationCache(Boolean publishCaches) {
+  private boolean uploadCompilationCache(Boolean publishTeamCityArtifacts) {
     String cachePath = "caches/$commitHash"
     if (uploader.isExist(cachePath)) return false
 
@@ -125,7 +125,7 @@ class CompilationOutputsUploader {
     uploader.upload(cachePath, zipFile)
 
     // Publish artifact for dependent configuration
-    if (publishCaches) {
+    if (publishTeamCityArtifacts) {
       File zipArtifact = new File(tmpDir, "caches.zip")
       FileUtil.copy(zipFile, zipArtifact)
       context.messages.artifactBuilt(zipArtifact.absolutePath)
diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/compilation/PortableCompilationCache.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/compilation/PortableCompilationCache.groovy
index 43f15394ae88..838b52c67b79 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/compilation/PortableCompilationCache.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/compilation/PortableCompilationCache.groovy
@@ -100,7 +100,7 @@ class PortableCompilationCache {
   /**
    * Upload local compilation cache to remote cache
    */
-  def upload(Boolean publishCaches) {
+  def upload(Boolean publishTeamCityArtifacts) {
     if (!forceRebuild && downloader.availableForHeadCommit) {
       context.messages.info('Nothing new to upload')
     }
@@ -118,7 +118,7 @@ class PortableCompilationCache {
       new CompilationOutputsUploader(
         context, remoteCacheUrl, remotePerCommitHash,
         agentPersistentStorage, syncFolder, updateCommitHistory
-      ).upload(publishCaches)
+      ).upload(publishTeamCityArtifacts)
     }
   }
 }