@@ -114,7 +114,7 @@ chmod +x "$meltingPotScript" &&
114114test " $( grep -F " [ERROR]" " $meltingPotLog " | grep -v " using default branch" ) " &&
115115 die ' Melting pot generation failed!'
116116
117- sectionStart ' Adjusting the melting pot'
117+ sectionStart ' Adjusting the melting pot: build.sh script '
118118
119119buildScript=" $meltingPotDir /build.sh"
120120buildScriptTemp=" $buildScript .tmp"
@@ -177,6 +177,10 @@ chmod +x "$buildScript" &&
177177rm " $buildScriptTemp " ||
178178 die ' Error adjusting melting pot build script!'
179179
180+ sectionEnd # Adjusting the melting pot: build.sh script
181+
182+ sectionStart ' Adjusting the melting pot: component POMs'
183+
180184# HACK: Adjust component POMs to satisfy Maven HTTPS strictness.
181185find " $meltingPotDir " -name pom.xml |
182186 while read pom
195199 perl -0777 -i -pe ' s/(<parent>\s*<groupId>org.scijava<\/groupId>\s*<artifactId>pom-scijava<\/artifactId>\s*<version>)[^\n]*/${1}999-mega-melt<\/version>/igs' " $pom "
196200done
197201
202+ sectionEnd # Adjusting the melting pot: component POMs
203+
204+ sectionStart ' Adjusting the melting pot: melt.sh script'
205+
198206# HACK: Skip tests for projects with known problems.
199207
200208mv " $meltScript " " $meltScript .original" &&
@@ -207,6 +215,10 @@ grep -qxF "$f" $dir/skipTests.txt \&\& buildFlags=-DskipTests\
207215chmod +x " $meltScript " ||
208216 die " Failed to adjust $meltScript "
209217
218+ sectionEnd # Adjusting the melting pot: melt.sh script
219+
220+ sectionStart ' Adjusting the melting pot: unit test hacks'
221+
210222# HACK: Remove flaky tests from imagej-ops builds.
211223# CachedOpEnvironmentTest fails intermittently. Of course, it should be
212224# somehow fixed in imagej-ops. But for now, let's not let it ruin the melt.
@@ -219,7 +231,7 @@ echo "org.janelia.saalfeldlab/n5-aws-s3" >> "$skipTestsFile" &&
219231echo " sc.fiji/labkit-pixel-classification" >> " $skipTestsFile " ||
220232 die " Failed to generate $skipTestsFile "
221233
222- sectionEnd # Adjusting the melting pot
234+ sectionEnd # Adjusting the melting pot: unit test hacks
223235
224236# Run the melting pot now, unless -s flag was given.
225237doMelt=t
0 commit comments