Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  Fix plugin builds on OSX

Change-Id: I1f31c3d13f31a5a16e6d91dc1c7887e48ea2c851
This commit is contained in:
Marco Miller
2020-07-13 10:40:54 -04:00

View File

@@ -66,7 +66,7 @@ def gerrit_plugin(
"export TZ",
"GEN_VERSION=$$(cat bazel-out/stable-status.txt | grep -w STABLE_BUILD_%s_LABEL | cut -d ' ' -f 2)" % dir_name.upper(),
"cd $$TMP",
"unzip -q $$ROOT/$<",
"unzip -qo $$ROOT/$<",
"echo \"Implementation-Version: $$GEN_VERSION\n$$(cat META-INF/MANIFEST.MF)\" > META-INF/MANIFEST.MF",
"find . -exec touch '{}' ';'",
"zip -Xqr $$ROOT/$@ .",