|
241 | 241 | COMMIT_COUNT=$((COMMIT_COUNT + 1)) |
242 | 242 | fi |
243 | 243 |
|
| 244 | +# 6.4c(2) Migrate custom conformance execution script if present |
| 245 | +if [ -f "$SOURCE_REPO_NAME/.kokoro/conformance.sh" ]; then |
| 246 | + echo "Migrating conformance.sh to monorepo root .kokoro/${SOURCE_REPO_NAME#java-}-conformance.sh..." |
| 247 | + mkdir -p .kokoro |
| 248 | + cp "$SOURCE_REPO_NAME/.kokoro/conformance.sh" ".kokoro/${SOURCE_REPO_NAME#java-}-conformance.sh" |
| 249 | + |
| 250 | + echo "Adapting conformance script paths and build scopes for monorepo root..." |
| 251 | + PL_MODULES="${SOURCE_REPO_NAME}" |
| 252 | + if [ -n "${PRE_INSTALL_DEPS}" ]; then |
| 253 | + PL_MODULES="${PL_MODULES},${PRE_INSTALL_DEPS}" |
| 254 | + fi |
| 255 | + sed -i.bak "s|mvn install|mvn install -pl ${PL_MODULES} -am|" ".kokoro/${SOURCE_REPO_NAME#java-}-conformance.sh" |
| 256 | + sed -i.bak "s|cd test-proxy|cd ${SOURCE_REPO_NAME}/test-proxy|" ".kokoro/${SOURCE_REPO_NAME#java-}-conformance.sh" |
| 257 | + sed -i.bak "s|-jar test-proxy/target/|-jar ${SOURCE_REPO_NAME}/test-proxy/target/|" ".kokoro/${SOURCE_REPO_NAME#java-}-conformance.sh" |
| 258 | + sed -i.bak "s|kill \${proxyPID}|kill \${proxyPID} \&\& sleep 5|" ".kokoro/${SOURCE_REPO_NAME#java-}-conformance.sh" |
| 259 | + sed -i.bak "s|../../test-proxy/known_failures.txt|../../\${SOURCE_REPO_NAME}/test-proxy/known_failures.txt|" ".kokoro/${SOURCE_REPO_NAME#java-}-conformance.sh" |
| 260 | + rm -f ".kokoro/${SOURCE_REPO_NAME#java-}-conformance.sh.bak" |
| 261 | + |
| 262 | + if [ -f "${SOURCE_REPO_NAME}/test-proxy/pom.xml" ]; then |
| 263 | + echo "Fixing protoc-gen-grpc-java version in test-proxy/pom.xml for Apple Silicon (osx-aarch_64) support..." |
| 264 | + sed -i.bak "s|1.24.0:exe:\${os.detected.classifier}|1.62.2:exe:\${os.detected.classifier}|" "${SOURCE_REPO_NAME}/test-proxy/pom.xml" |
| 265 | + rm -f "${SOURCE_REPO_NAME}/test-proxy/pom.xml.bak" |
| 266 | + git add "${SOURCE_REPO_NAME}/test-proxy/pom.xml" |
| 267 | + git commit -n --no-gpg-sign -m "chore($SOURCE_REPO_NAME): fix protoc-gen-grpc-java version for Apple Silicon support" |
| 268 | + COMMIT_COUNT=$((COMMIT_COUNT + 1)) |
| 269 | + fi |
| 270 | + |
| 271 | + git add ".kokoro/${SOURCE_REPO_NAME#java-}-conformance.sh" |
| 272 | + git commit -n --no-gpg-sign -m "chore($SOURCE_REPO_NAME): migrate and adapt conformance execution script" |
| 273 | + COMMIT_COUNT=$((COMMIT_COUNT + 1)) |
| 274 | +fi |
| 275 | + |
244 | 276 | # 6.4d Update repo and repo_short in .repo-metadata.json |
245 | 277 | REPO_METADATA="$SOURCE_REPO_NAME/.repo-metadata.json" |
246 | 278 | if [ -f "$REPO_METADATA" ]; then |
|
0 commit comments