opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-3.1'

Browse Source 
* stable-3.1:
  LazyPostReceiveHookChain: Don't call ReceivePack.getPackSize for delete
  Move repository description to the last column.
  Jenkinsfile: Always build java sources if WORKSPACE file changed

Change-Id: Ifa56bbddba70a5358d9d04c35ab5a26ef3af2130
This commit is contained in:
David Pursehouse
2019-11-13 14:09:39 -08:00
parent 02109bdb4e 83e3a6660c
commit 65e6428d2c
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Jenkinsfile vendored
View File

@@ -139,7 +139,7 @@ def collectBuildModes() {
def polygerritFiles = changedFiles.findAll { it.startsWith("polygerrit-ui") || def polygerritFiles = changedFiles.findAll { it.startsWith("polygerrit-ui") ||
it.startsWith("lib/js") } it.startsWith("lib/js") }
if(polygerritFiles.size() > 0 || changedFiles.contains("WORKSPACE")) { if(polygerritFiles.size() > 0) {
if(changedFiles.size() == polygerritFiles.size()) { if(changedFiles.size() == polygerritFiles.size()) {
println "Only PolyGerrit UI changes detected, skipping other test modes..." println "Only PolyGerrit UI changes detected, skipping other test modes..."
Builds.modes = ["polygerrit"] Builds.modes = ["polygerrit"]
@@ -147,6 +147,9 @@ def collectBuildModes() {
println "PolyGerrit UI changes detected, adding 'polygerrit' validation..." println "PolyGerrit UI changes detected, adding 'polygerrit' validation..."
Builds.modes += "polygerrit" Builds.modes += "polygerrit"
} }
} else if(changedFiles.contains("WORKSPACE")) {
println "WORKSPACE file changes detected, adding 'polygerrit' validation..."
Builds.modes += "polygerrit"
} }
} }

10
java/com/google/gerrit/server/git/receive/LazyPostReceiveHookChain.java
View File

@@ -79,13 +79,9 @@ public class LazyPostReceiveHookChain implements PostReceiveHook {
} }
public static boolean affectsSize(ReceivePack rp, Collection<ReceiveCommand> commands) { public static boolean affectsSize(ReceivePack rp, Collection<ReceiveCommand> commands) {
if (rp.getPackSize() > 0L) { if (commands.stream().allMatch(c -> c.getType() == ReceiveCommand.Type.DELETE)) {
for (ReceiveCommand cmd : commands) { return false;
if (cmd.getType() != ReceiveCommand.Type.DELETE) {
return true;
}
}
} }
return false; return rp.getPackSize() > 0L;
} }
} }