Adjustments after merge

.github/workflows/ci.yml

@@ -194,6 +194,44 @@ jobs:
           name: eclipse-gips-macos-user
           path: eclipse-gips-macos-user.zip
 
+  # Build Eclipse GIPS macOS ARM user
+  build-macos-arm-user:
+    needs: [create-splash-image, collect-github-api-artifacts]
+    runs-on: [macos-14]
+    steps:
+      - name: Start message
+        run: echo "Started CI build (Eclipse GIPS macOS user)."
+      - name: Install dependencies
+        run: |
+          brew install p7zip coreutils grep wget curl
+      - name: Check out repository code
+        uses: actions/checkout@v4
+      - name: Download splash image
+        uses: actions/download-artifact@v4
+        with:
+          name: splash.bmp
+      - name: Download emoflon-headless updatesite
+        uses: actions/download-artifact@v4
+        with:
+          name: emoflon-headless-updatesite.zip
+      - name: Move emoflon-headless updatesite
+        run: |
+          mkdir -p ./tmp/emoflon-headless
+          mv emoflon-headless-updatesite.zip ./tmp/emoflon-headless/updatesite.zip
+      - name: Download Eclipse import plugin JAR
+        uses: actions/download-artifact@v4
+        with:
+          name: com.seeq.eclipse.importprojects.jar
+      - name: Run build script
+        run: chmod +x build.sh && ./build.sh -m user -o macosarm
+      - name: Fix permissions
+        run: sudo xattr -cr ./eclipse/Eclipse.app
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: eclipse-gips-macos-arm-user
+          path: eclipse-gips-macos-arm-user.zip
+
   # Build Eclipse GIPS Windows user
   build-windows-user:
     needs: [create-splash-image, collect-github-api-artifacts]
@@ -240,7 +278,7 @@ jobs:
 
   # Create a release if running on tag
   create-release:
-    needs: [build-linux-user, build-linux-user-ci, build-macos-user, build-windows-user]
+    needs: [build-linux-user, build-linux-user-ci, build-macos-user, build-macos-arm-user, build-windows-user]
     runs-on: [ubuntu-20.04]
     # Only run on pushed tags (and explicitely ignore scheduled runs)
     if: github.event_name == 'push' && contains(github.ref, 'refs/tags/') && github.event_name != 'schedule'
@@ -257,6 +295,11 @@ jobs:
         with:
           files: |
             eclipse-gips-macos-user/eclipse-gips-macos-user.zip
+      - name: Release eclipse-gips-macos
+        uses: softprops/action-gh-release@v2
+        with:
+          files: |
+            eclipse-gips-macos-arm-user/eclipse-gips-macos-arm-user.zip
       - name: Release eclipse-gips-linux-ci
         uses: softprops/action-gh-release@v2
         with:

build.sh

@@ -29,9 +29,11 @@ VERSION=$VERSION # version comes from the CI env
 ARCHIVE_FILE_LINUX="eclipse-modeling-$VERSION-R-linux-gtk-x86_64.tar.gz"
 ARCHIVE_FILE_WINDOWS="eclipse-modeling-$VERSION-R-win32-x86_64.zip"
 ARCHIVE_FILE_MACOS="eclipse-modeling-$VERSION-R-macosx-cocoa-x86_64.dmg"
+ARCHIVE_FILE_MACOSARM="eclipse-modeling-$VERSION-R-macosx-cocoa-aarch64.dmg"
 OUTPUT_FILE_PREFIX_LINUX="eclipse-gips-linux"
 OUTPUT_FILE_PREFIX_WINDOWS="eclipse-gips-windows"
 OUTOUT_FILE_PREFIX_MACOS="eclipse-gips-macos"
+OUTOUT_FILE_PREFIX_MACOSARM="eclipse-gips-macos-arm"
 MIRROR="https://ftp.fau.de"
 UPDATESITES="https://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases/,https://hallvard.github.io/plantuml/,https://hipe-devops.github.io/HiPE-Updatesite/hipe.updatesite/,https://www.kermeta.org/k2/update,https://emoflon.org/emoflon-ibex-updatesite/snapshot/updatesite/,https://www.genuitec.com/updates/devstyle/ci/,https://download.eclipse.org/releases/$VERSION,https://www.codetogether.com/updates/ci/,http://update.eclemma.org/,https://pmd.github.io/pmd-eclipse-plugin-p2-site/,https://checkstyle.org/eclipse-cs-update-site/,https://spotbugs.github.io/eclipse/,https://download.eclipse.org/technology/m2e/releases/latest,https://echtzeitsysteme.github.io/gips-updatesite/snapshot/updatesite/"
 EMOFLON_HEADLESS_SRC="https://api.github.com/repos/eMoflon/emoflon-headless/releases/latest"