diff options
author | Ed Merks | 2021-08-29 07:47:11 +0000 |
---|---|---|
committer | Ed Merks | 2021-08-29 07:47:11 +0000 |
commit | 9cf8896bd63472bc2f2d34ee80d5b31878e31faa (patch) | |
tree | 6bb74bdbeac35d65851aa3d80364385e92258d80 /releng | |
parent | 8048238a77c4d11494f2486361695985ccd92b03 (diff) | |
download | org.eclipse.emf-9cf8896bd63472bc2f2d34ee80d5b31878e31faa.tar.gz org.eclipse.emf-9cf8896bd63472bc2f2d34ee80d5b31878e31faa.tar.xz org.eclipse.emf-9cf8896bd63472bc2f2d34ee80d5b31878e31faa.zip |
[releng] The update site generator should not assume there is a site
repository when promoting a milestone to a release.
Diffstat (limited to 'releng')
-rw-r--r-- | releng/org.eclipse.emf.releng/src/org/eclipse/emf/releng/UpdateSiteGeneratorTest.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/releng/org.eclipse.emf.releng/src/org/eclipse/emf/releng/UpdateSiteGeneratorTest.java b/releng/org.eclipse.emf.releng/src/org/eclipse/emf/releng/UpdateSiteGeneratorTest.java index e3660165c..c0d91bb4b 100644 --- a/releng/org.eclipse.emf.releng/src/org/eclipse/emf/releng/UpdateSiteGeneratorTest.java +++ b/releng/org.eclipse.emf.releng/src/org/eclipse/emf/releng/UpdateSiteGeneratorTest.java @@ -78,11 +78,6 @@ public class UpdateSiteGeneratorTest @Test public void step01PromoteUpdateSite() throws Exception { - String userDir = System.getProperty("user.dir"); - String sourceRepository = UpdateSiteGenerator.getCanonicalPath(new File(userDir, "../org.eclipse.emf.site/target/repository")); - System.out.println("sourceRepository=" + sourceRepository); - Assert.assertTrue("Update site is invalid: " + sourceRepository, new File(sourceRepository, "content.jar").isFile()); - String buildTimestamp = System.getProperty("publish.build.timestamp"); Assert.assertNotNull("publish.build.timestamp is null", buildTimestamp); try @@ -106,6 +101,11 @@ public class UpdateSiteGeneratorTest Assume.assumeTrue("true".equals(System.getProperty("publish.repository"))); Assume.assumeTrue(!"release".equals(System.getProperty("publish.build.type"))); + String userDir = System.getProperty("user.dir"); + String sourceRepository = UpdateSiteGenerator.getCanonicalPath(new File(userDir, "../org.eclipse.emf.site/target/repository")); + System.out.println("sourceRepository=" + sourceRepository); + Assert.assertTrue("Update site is invalid: " + sourceRepository, new File(sourceRepository, "content.jar").isFile()); + UpdateSiteGenerator updateSiteGenerator = new UpdateSiteGenerator(); System.out.println("Promoting update site to " + updateSiteGenerator.getPromoteUpdateSiteDestination(buildType, buildTimestamp)); File promotedUpdateSite = updateSiteGenerator.promoteUpdateSite(sourceRepository, buildType, buildTimestamp); |