diff options
| author | Jonah Graham | 2020-09-10 21:47:08 +0000 |
|---|---|---|
| committer | Jonah Graham | 2020-09-10 21:47:08 +0000 |
| commit | 09c96733c803e5de4709f9035727eb29c60519a9 (patch) | |
| tree | c60cb8b5bcddd10a2d975bff905f57e61b93dfc1 | |
| parent | f619800d769d67f7e3400acbafc79a35996e7b5e (diff) | |
| download | org.eclipse.epp.packages-09c96733c803e5de4709f9035727eb29c60519a9.tar.gz org.eclipse.epp.packages-09c96733c803e5de4709f9035727eb29c60519a9.tar.xz org.eclipse.epp.packages-09c96733c803e5de4709f9035727eb29c60519a9.zip | |
Bug 566651: No longer flatten build on release day (fixup)
Change-Id: I88f48ad13fb85a418197d1487a01e81fe62439d4
| -rwxr-xr-x | releng/org.eclipse.epp.config/tools/promote-a-build.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/releng/org.eclipse.epp.config/tools/promote-a-build.sh b/releng/org.eclipse.epp.config/tools/promote-a-build.sh index 2d19b98b..6ecdbe74 100755 --- a/releng/org.eclipse.epp.config/tools/promote-a-build.sh +++ b/releng/org.eclipse.epp.config/tools/promote-a-build.sh @@ -86,11 +86,11 @@ popd # leave downloads # ---------------------------------------------------------------------------------------------- # Prepare compositeArtifacts.jar/compositeContent.jar pushd p2 -if [ "$RELEASE_MILESTONE" != "M1" ] && [ "$RELEASE_MILESTONE" != "RC2" ]; then +if [ "$RELEASE_MILESTONE" != "M1" ] && [ "$RELEASE_MILESTONE" != "R" ]; then # For non M1 build we need to add to the existing p2 content, # for M1 we start from scratch - # For RC2 build the composite should have just the release in it + # For R build the composite should have just the release in it cp -rp ${REPO}/* . fi mv repository ${RELEASE_DIR} @@ -158,6 +158,6 @@ ${ECHO} mkdir -p ${REPO} ${ECHO} cp -r downloads/* ${DOWNLOADS}/${RELEASE_DIR} ${ECHO} cp -r p2/p2.index ${REPO} ${ECHO} cp -r p2/${RELEASE_DIR} ${REPO} -${ECHO} cp p2/compositeArtifacts.jar ${REPO}/compositeArtifacts${RELEASE_DIR}.jar -${ECHO} cp p2/compositeContent.jar ${REPO}/compositeContent${RELEASE_DIR}.jar +${ECHO} cp p2/compositeArtifacts.jar ${REPO}/compositeArtifacts${RELEASE_MILESTONE}.jar +${ECHO} cp p2/compositeContent.jar ${REPO}/compositeContent${RELEASE_MILESTONE}.jar ${ECHO} cp release.xml ${EPP_DOWNLOADS}/downloads/release/release.xml |