Revert "Temporarily don't build some parts of EPP to reduce disk usage"

This reverts commit 657f6e6.
eclipse-packaging · Feb 22, 2024 · af613f4 · af613f4
1 parent 657f6e6
commit af613f4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git a/releng/org.eclipse.epp.config/parent/pom.xml b/releng/org.eclipse.epp.config/parent/pom.xml
@@ -123,12 +123,11 @@
               <ws>gtk</ws>
               <arch>x86_64</arch>
             </environment>
-            <!-- Temporarily don't build aarch64 to reduce disk usage - see https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/issues/4336#note_1799582 -->
-            <!-- <environment>
+            <environment>
               <os>linux</os>
               <ws>gtk</ws>
               <arch>aarch64</arch>
-            </environment> -->
+            </environment>
             <environment>
               <os>win32</os>
               <ws>win32</ws>
@@ -139,11 +138,11 @@
               <ws>cocoa</ws>
               <arch>x86_64</arch>
             </environment>
-            <!-- <environment>
+            <environment>
               <os>macosx</os>
               <ws>cocoa</ws>
               <arch>aarch64</arch>
-            </environment> -->
+            </environment>
           </environments>
         </configuration>
       </plugin>

diff --git a/releng/org.eclipse.epp.config/parent/product/pom.xml b/releng/org.eclipse.epp.config/parent/product/pom.xml
@@ -121,8 +121,7 @@
             <groupId>org.eclipse.cbi.maven.plugins</groupId>
             <artifactId>eclipse-dmg-packager</artifactId>
             <executions>
-              <!-- # Temporarily don't build aarch64 to reduce disk usage - see https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/issues/4336#note_1799582 -->
-              <!-- <execution>
+              <execution>
                 <id>dmg-package-platform-aarch64</id>
                 <goals>
                   <goal>package-dmg</goal>
@@ -134,7 +133,7 @@
                   <sign>${eclipse-sign-dmg-property}</sign>
                   <timeoutMillis>600000</timeoutMillis>
                 </configuration>
-              </execution> -->
+              </execution>
               <execution>
                 <id>dmg-package-platform-x86_64</id>
                 <goals>

diff --git a/releng/org.eclipse.epp.config/tools/upload-to-staging.sh b/releng/org.eclipse.epp.config/tools/upload-to-staging.sh
@@ -31,12 +31,8 @@ RELEASE_DIR=$(get_property RELEASE_DIR)
 SIMREL_REPO=$(get_property SIMREL_REPO)
 WORKSPACE=${WORKSPACE:-"${PWD}"}
 GIT_REPOSITORY=${GIT_REPOSITORY:-"org.eclipse.epp.packages"}
-# Temporarily don't build less common packages to reduce disk usage - see https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/issues/4336#note_1799582 -->
-PACKAGES="committers cpp dsl java jee"
-#PACKAGES="committers cpp dsl embedcpp java jee modeling php rcp scout"
-# Temporarily don't build aarch64 to reduce disk usage - see https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/issues/4336#note_1799582
-PLATFORMS=${PLATFORMS:-"linux.gtk.x86_64.tar.gz macosx.cocoa.x86_64.dmg macosx.cocoa.x86_64.tar.gz win32.win32.x86_64.zip"}
-#PLATFORMS=${PLATFORMS:-"linux.gtk.aarch64.tar.gz linux.gtk.x86_64.tar.gz macosx.cocoa.aarch64.dmg macosx.cocoa.aarch64.tar.gz macosx.cocoa.x86_64.dmg macosx.cocoa.x86_64.tar.gz win32.win32.x86_64.zip"}
+PACKAGES="committers cpp dsl embedcpp java jee modeling php rcp scout"
+PLATFORMS=${PLATFORMS:-"linux.gtk.aarch64.tar.gz linux.gtk.x86_64.tar.gz macosx.cocoa.aarch64.dmg macosx.cocoa.aarch64.tar.gz macosx.cocoa.x86_64.dmg macosx.cocoa.x86_64.tar.gz win32.win32.x86_64.zip"}
 STAGING=${STAGING:-"/home/data/httpd/download.eclipse.org/technology/epp/staging"}
 
 cd ${WORKSPACE}/${GIT_REPOSITORY}/archive