Skip to content

Commit 1a84cf0

Browse files
committed
fix(migration): declare shared dependencies submodules directly in conformance build reactor
1 parent b28142b commit 1a84cf0

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

monorepo-migration/migrate.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ if [ -f "$SOURCE_REPO_NAME/.kokoro/conformance.sh" ]; then
256256
cp "$SOURCE_REPO_NAME/.kokoro/conformance.sh" ".kokoro/${SOURCE_REPO_NAME#java-}-conformance.sh"
257257

258258
echo "Adapting conformance script paths and build scopes for monorepo root..."
259-
PL_MODULES="${SOURCE_REPO_NAME},sdk-platform-java/java-shared-dependencies"
259+
PL_MODULES="${SOURCE_REPO_NAME}"
260260
# Also include any child BOM modules to ensure snapshots install to local .m2 cache for test utilities
261261
for bom_dir in "${SOURCE_REPO_NAME}"/*-bom; do
262262
if [ -d "$bom_dir" ]; then
@@ -267,6 +267,10 @@ if [ -f "$SOURCE_REPO_NAME/.kokoro/conformance.sh" ]; then
267267
if [ -n "${PRE_INSTALL_DEPS}" ]; then
268268
PL_MODULES="${PL_MODULES},${PRE_INSTALL_DEPS}"
269269
fi
270+
271+
echo "Injecting SDK Platform pre-installation block into conformance script..."
272+
sed -i.bak 's|# attempt to install 3 times|echo "Pre-installing SDK Platform toolchain and submodules..."\npushd sdk-platform-java\nretry_with_backoff 3 10 mvn install -B -ntp -DskipTests=true -Dclirr.skip=true -Denforcer.skip=true -Dmaven.javadoc.skip=true -T 1C\npopd\n\n# attempt to install 3 times|' ".kokoro/${SOURCE_REPO_NAME#java-}-conformance.sh"
273+
270274
sed -i.bak "s|mvn install|mvn install -pl ${PL_MODULES} -am|" ".kokoro/${SOURCE_REPO_NAME#java-}-conformance.sh"
271275
sed -i.bak "s|cd test-proxy|cd ${SOURCE_REPO_NAME}/test-proxy|" ".kokoro/${SOURCE_REPO_NAME#java-}-conformance.sh"
272276
sed -i.bak "s|-jar test-proxy/target/|-jar ${SOURCE_REPO_NAME}/test-proxy/target/|" ".kokoro/${SOURCE_REPO_NAME#java-}-conformance.sh"

0 commit comments

Comments
 (0)