From 9853ec50f06eb5d9ddab7b43f904b5c90729e579 Mon Sep 17 00:00:00 2001 From: Maximilian Kratz Date: Mon, 31 Oct 2022 10:03:14 +0100 Subject: [PATCH 1/8] Adds first modifications for eMoflon::Neo --- README.md | 38 ++++++++++++++++------------------ build.sh | 10 ++++----- emoflon-update.sh | 2 +- packages/emoflon-packages.list | 6 +----- packages/hipe-packages.list | 1 - 5 files changed, 25 insertions(+), 32 deletions(-) delete mode 100644 packages/hipe-packages.list diff --git a/README.md b/README.md index 02750d8..d4600c7 100644 --- a/README.md +++ b/README.md @@ -1,25 +1,23 @@ -# emoflon-eclipse-build +# eMoflon::Neo Eclipse Build -[![Build Eclipse eMoflon](https://github.com/eMoflon/emoflon-eclipse-build/actions/workflows/ci.yml/badge.svg?branch=main&event=push)](https://github.com/eMoflon/emoflon-eclipse-build/actions/workflows/ci.yml) +[![Build Eclipse eMoflon](https://github.com/maxkratz/emoflon-neo-eclipse-build/actions/workflows/ci.yml/badge.svg?branch=main&event=push)](https://github.com/maxkratz/emoflon-neo-eclipse-build/actions/workflows/ci.yml) -This repository is used to automatically build an Eclipse [eMoflon](https://github.com/eMoflon/emoflon-ibex) environment. +This repository is used to automatically build an Eclipse [eMoflon::Neo](https://github.com/eMoflon/emoflon-neo) environment. -| Name | OS | eMoflon installed | Dark theme installed | Splash image | Pattern matcher | Additional packages | -|--------------------------|---------|--------------------|----------------------|--------------------|-----------------|---------------------| -| Eclipse eMoflon user | Linux | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | HiPE | :heavy_check_mark: | -| Eclipse eMoflon dev | Linux | | :heavy_check_mark: | :heavy_check_mark: | HiPE, *) | :heavy_check_mark: | -| Eclipse eMoflon user CI | Linux | :heavy_check_mark: | | | HiPE | | -| Eclipse eMoflon dev CI | Linux | | | | HiPE, *) | | -| Eclipse eMoflon dev HiPE | Linux | | :heavy_check_mark: | :heavy_check_mark: | *) | :heavy_check_mark: | -| Eclipse eMoflon user | Windows | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | HiPE | :heavy_check_mark: | -| Eclipse eMoflon dev | Windows | | :heavy_check_mark: | :heavy_check_mark: | HiPE, *) | :heavy_check_mark: | -| Eclipse eMoflon dev HiPE | Windows | | :heavy_check_mark: | :heavy_check_mark: | *) | :heavy_check_mark: | -| Eclipse eMoflon user | macOS | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | HiPE | :heavy_check_mark: | -| Eclipse eMoflon dev | macOS | | :heavy_check_mark: | :heavy_check_mark: | HiPE, *) | :heavy_check_mark: | -| Eclipse eMoflon dev HiPE | macOS | | :heavy_check_mark: | :heavy_check_mark: | *) | :heavy_check_mark: | +| Name | OS | eMoflon installed | Dark theme installed | Splash image | Additional packages | +|--------------------------|---------|--------------------|----------------------|--------------------|---------------------| +| Eclipse eMoflon user | Linux | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | +| Eclipse eMoflon dev | Linux | | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | +| Eclipse eMoflon user CI | Linux | :heavy_check_mark: | | | | +| Eclipse eMoflon dev CI | Linux | | | | | +| Eclipse eMoflon dev HiPE | Linux | | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | +| Eclipse eMoflon user | Windows | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | +| Eclipse eMoflon dev | Windows | | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | +| Eclipse eMoflon dev HiPE | Windows | | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | +| Eclipse eMoflon user | macOS | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | +| Eclipse eMoflon dev | macOS | | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | +| Eclipse eMoflon dev HiPE | macOS | | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | -*) Democles will be installed manually via the [emoflon-dev-workspace](https://github.com/eMoflon/emoflon-ibex#how-to-develop). -Furthermore, all pattern matcher integrations for eMoflon (HiPE and Democles) will be installed manually via the [emoflon-dev-workspace](https://github.com/eMoflon/emoflon-ibex#how-to-develop). **Additional packages** are installed for every non-CI build. Currently, the list of additional packages includes: @@ -34,11 +32,11 @@ Feel free to request others, e.g., via Github issues. ## Usage/Installation Quick installation using curl and bash: -`$ FOLDER="$HOME/eclipse-apps/emt"; mkdir -p $FOLDER && cd $FOLDER && curl https://raw.githubusercontent.com/eMoflon/emoflon-eclipse-build/main/emoflon-update.sh | bash -s -- $FOLDER` +`$ FOLDER="$HOME/eclipse-apps/emt"; mkdir -p $FOLDER && cd $FOLDER && curl https://raw.githubusercontent.com/maxkratz/emoflon-neo-eclipse-build/main/emoflon-update.sh | bash -s -- $FOLDER` ### Normal installation -**The latest release can be found [here](https://github.com/eMoflon/emoflon-eclipse-build/releases/latest).** +**The latest release can be found [here](https://github.com/maxkratz/emoflon-neo-eclipse-build/releases/latest).** Download an archive for the version you are looking for from the release page and extract it. ### Updating diff --git a/build.sh b/build.sh index 73dcb40..4b987c5 100755 --- a/build.sh +++ b/build.sh @@ -26,14 +26,14 @@ fi # 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_LINUX="eclipse-dsl-$VERSION-R-linux-gtk-x86_64.tar.gz" +ARCHIVE_FILE_WINDOWS="eclipse-dsl-$VERSION-R-win32-x86_64.zip" +ARCHIVE_FILE_MACOS="eclipse-dsl-$VERSION-R-macosx-cocoa-x86_64.dmg" OUTPUT_FILE_PREFIX_LINUX="eclipse-emoflon-linux" OUTPUT_FILE_PREFIX_WINDOWS="eclipse-emoflon-windows" OUTOUT_FILE_PREFIX_MACOS="eclipse-emoflon-macos" 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/" +UPDATESITES="https://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases/,https://hallvard.github.io/plantuml/,https://www.kermeta.org/k2/update,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://emoflon.org/emoflon-neo-updatesite/snapshot/" EMOFLON_HEADLESS_SRC="https://api.github.com/repos/eMoflon/emoflon-headless/releases/latest" # Import plug-in: @@ -42,7 +42,7 @@ IMPORT_PLUGIN_FILENAME="com.seeq.eclipse.importprojects_$IMPORT_PLUGIN_VERSION.j IMPORT_PLUGIN_SRC="https://api.github.com/repos/maxkratz/eclipse-import-projects-plugin/releases/tags/v$IMPORT_PLUGIN_VERSION" # Array with the order to install the plugins with. -ORDER_LINUX=("xtext" "plantuml" "hipe" "kermeta" "misc" "emoflon-headless" "emoflon" "theme" "additional") +ORDER_LINUX=("xtext" "plantuml" "kermeta" "misc" "emoflon-headless" "emoflon" "theme" "additional") # # Configure OS specific details diff --git a/emoflon-update.sh b/emoflon-update.sh index 924f251..474f943 100644 --- a/emoflon-update.sh +++ b/emoflon-update.sh @@ -7,7 +7,7 @@ ECLIPSE_ARCHIVE=eclipse-emoflon-windows-dev # Name of the archive to download FORCE_DOWNLOAD=0 # 1 = force download of new archive TARGET_DIR=$1 # Target directory -API_URL="https://api.github.com/repos/eMoflon/emoflon-eclipse-build/releases/latest" +API_URL="https://api.github.com/repos/maxkratz/emoflon-neo-eclipse-build/releases/latest" set -e START_PWD=$PWD diff --git a/packages/emoflon-packages.list b/packages/emoflon-packages.list index 0a34018..55e4426 100644 --- a/packages/emoflon-packages.list +++ b/packages/emoflon-packages.list @@ -1,5 +1 @@ -org.emoflon.ibex.ide.democles.feature.feature.group -org.emoflon.ibex.ide.feature.feature.group -org.emoflon.ibex.ide.hipe.feature.feature.group -org.emoflon.ibex.tgg.editor.feature.feature.group -org.moflon.core.feature.feature.group +org.emoflon.neo.feature diff --git a/packages/hipe-packages.list b/packages/hipe-packages.list deleted file mode 100644 index feb34d3..0000000 --- a/packages/hipe-packages.list +++ /dev/null @@ -1 +0,0 @@ -hipe.feature.feature.group From fc6f91eec4a70bf32c8e324fe129df6fccd5bfc9 Mon Sep 17 00:00:00 2001 From: Maximilian Kratz Date: Mon, 31 Oct 2022 11:02:02 +0100 Subject: [PATCH 2/8] Fixes wrong hard-coded archive names in extracting stage --- build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 4b987c5..3c5ecfa 100755 --- a/build.sh +++ b/build.sh @@ -216,9 +216,9 @@ setup_emoflon_headless_local_updatesite log "Clean-up Eclipse folder and extract downloaded archive." rm -rf ./eclipse/* if [[ "$OS" = "linux" ]]; then - tar -xzf eclipse-modeling-$VERSION-R-linux-gtk-x86_64.tar.gz + tar -xzf $ARCHIVE_FILE_LINUX elif [[ "$OS" = "windows" ]]; then - unzip -qq -o eclipse-modeling-$VERSION-R-win32-x86_64.zip + unzip -qq -o $ARCHIVE_FILE_WINDOWS elif [[ "$OS" = "macos" ]]; then 7z x $ARCHIVE_FILE_MACOS # Rename folder because "Eclipse" is inconsistent From 76d16c29dfc1168bcd7850516a84b5841e74500e Mon Sep 17 00:00:00 2001 From: Maximilian Kratz Date: Wed, 9 Nov 2022 10:06:44 +0100 Subject: [PATCH 3/8] Filter debug outputs in CI build script --- build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 3c5ecfa..19a0240 100755 --- a/build.sh +++ b/build.sh @@ -96,7 +96,8 @@ install_packages () { $ECLIPSE_BIN_PATH -nosplash \ -application org.eclipse.equinox.p2.director \ -repository "$1" \ - -installIU "$(parse_package_list $2)" + -installIU "$(parse_package_list $2)" \ + | grep -v 'DEBUG' } # Displays the given input including "=> " on the console. From 0d4ee26c414e3090f241cb8118d68bfa4e7d971d Mon Sep 17 00:00:00 2001 From: Maximilian Kratz Date: Wed, 9 Nov 2022 10:12:07 +0100 Subject: [PATCH 4/8] Fixes a hard-coded directory URL --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 19a0240..a043b9d 100755 --- a/build.sh +++ b/build.sh @@ -174,7 +174,7 @@ install_global_eclipse_settings () { # Remove all configured update sites remove_update_sites () { log "Remove all update sites." - UPDATE_SITE_CONFIG_PATH="$ECLIPSE_BASE_PATH/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.modeling.profile/.data/.settings" + UPDATE_SITE_CONFIG_PATH="$ECLIPSE_BASE_PATH/p2/org.eclipse.equinox.p2.engine/profileRegistry/epp.package.dsl.profile/.data/.settings" UPDATE_SITE_METADATA="org.eclipse.equinox.p2.metadata.repository.prefs" UPDATE_SITE_ARTIFACT="org.eclipse.equinox.p2.artifact.repository.prefs" From 37b5f94fe393d1f0c34adfcab64739777f4a24b5 Mon Sep 17 00:00:00 2001 From: Maximilian Kratz Date: Wed, 9 Nov 2022 10:47:34 +0100 Subject: [PATCH 5/8] Post merge fixes (IBeX -> Neo) --- build.sh | 2 +- emoflon-update.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 87af3ad..58ec096 100755 --- a/build.sh +++ b/build.sh @@ -133,7 +133,7 @@ setup_emoflon_headless_local_updatesite () { # Append local folder to path (has to be absolute and, therefore, dynamic) if [[ ! -z ${GITHUB_WORKSPACE} ]] && [[ "$OS" = "windows" ]]; then log "Using a Github-hosted runner on Windows." - UPDATESITES+=",file:/D:/a/emoflon-ibex-eclipse-build/emoflon-ibex-eclipse-build/tmp/emoflon-headless/" + UPDATESITES+=",file:/D:/a/emoflon-neo-eclipse-build/emoflon-neo-eclipse-build/tmp/emoflon-headless/" elif [[ "$OS" = "linux" ]]; then log "Using a runner on Linux." UPDATESITES+=",file://$PWD/tmp/emoflon-headless/" diff --git a/emoflon-update.sh b/emoflon-update.sh index fec1124..72ccb48 100644 --- a/emoflon-update.sh +++ b/emoflon-update.sh @@ -39,7 +39,7 @@ if [[ ! -f "./$ECLIPSE_ARCHIVE.zip" ]] || [[ "$FORCE_DOWNLOAD" = "1" ]]; then | grep "\"name\"\: \"v" \ | cut -d : -f 2,3 \ | tr -d \" |tr -d ,) - log "Downloading latest eMoflon::IBeX Eclipse archive from Github.\nRelease:$TAG" + log "Downloading latest eMoflon::Neo Eclipse archive from Github.\nRelease:$TAG" curl -s $API_URL \ | grep "$ECLIPSE_ARCHIVE.*zip" \ | cut -d : -f 2,3 \ From 478cf139bd2d1f4663a1b10657e7686537b7d9c5 Mon Sep 17 00:00:00 2001 From: Maximilian Kratz Date: Wed, 9 Nov 2022 12:45:30 +0100 Subject: [PATCH 6/8] Hopefully fixes eMoflon::Neo feature group for installation --- packages/emoflon-packages.list | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/emoflon-packages.list b/packages/emoflon-packages.list index 55e4426..dd4e1a3 100644 --- a/packages/emoflon-packages.list +++ b/packages/emoflon-packages.list @@ -1 +1 @@ -org.emoflon.neo.feature +org.emoflon.neo.feature.feature.group From cf2e5e8f501ddecae635af7d66088a7fca58a01b Mon Sep 17 00:00:00 2001 From: Maximilian Kratz Date: Wed, 9 Nov 2022 13:08:41 +0100 Subject: [PATCH 7/8] Removes HiPE-specific builds --- .github/workflows/ci.yml | 129 +-------------------------------------- README.md | 3 - 2 files changed, 1 insertion(+), 131 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 30b8bd7..06dea69 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -221,39 +221,6 @@ jobs: name: eclipse-emoflon-linux-dev-ci path: eclipse-emoflon-linux-dev-ci.zip - # Build Eclipse eMoflon Linux dev HiPE - build-linux-dev-hipe: - needs: [create-splash-image, collect-github-api-artifacts] - runs-on: [ubuntu-20.04] - steps: - - name: Start message - run: echo "Started CI build (Eclipse eMoflon Linux dev HiPE)." - - name: Check out repository code - uses: actions/checkout@v2 - - name: Download splash image - uses: actions/download-artifact@v2 - with: - name: splash.bmp - - name: Download emoflon-headless updatesite - uses: actions/download-artifact@v2 - 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@v2 - with: - name: com.seeq.eclipse.importprojects.jar - - name: Run build script - run: chmod +x build.sh && ./build.sh -m hipedev -o linux - - name: Upload artifact - uses: actions/upload-artifact@v2 - with: - name: eclipse-emoflon-linux-dev-hipe - path: eclipse-emoflon-linux-dev-hipe.zip - # Build Eclipse eMoflon macOS user build-macos-user: needs: [create-splash-image, collect-github-api-artifacts] @@ -332,45 +299,6 @@ jobs: name: eclipse-emoflon-macos-dev path: eclipse-emoflon-macos-dev.zip - # Build Eclipse eMoflon macOS dev HiPE - build-macos-dev-hipe: - needs: [create-splash-image, collect-github-api-artifacts] - runs-on: [macos-latest] - steps: - - name: Start message - run: echo "Started CI build (Eclipse eMoflon macOS dev HiPE)." - - name: Install dependencies - run: | - brew update - brew install p7zip coreutils grep wget curl - - name: Check out repository code - uses: actions/checkout@v2 - - name: Download splash image - uses: actions/download-artifact@v2 - with: - name: splash.bmp - - name: Download emoflon-headless updatesite - uses: actions/download-artifact@v2 - 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@v2 - with: - name: com.seeq.eclipse.importprojects.jar - - name: Run build script - run: chmod +x build.sh && ./build.sh -m hipedev -o macos - - name: Fix permissions - run: sudo xattr -cr ./eclipse/Eclipse.app - - name: Upload artifact - uses: actions/upload-artifact@v2 - with: - name: eclipse-emoflon-macos-dev-hipe - path: eclipse-emoflon-macos-dev-hipe.zip - # Build Eclipse eMoflon Windows user build-windows-user: needs: [create-splash-image, collect-github-api-artifacts] @@ -459,53 +387,9 @@ jobs: name: eclipse-emoflon-windows-dev path: eclipse-emoflon-windows-dev.zip - # Build Eclipse eMoflon Windows dev HiPE - build-windows-dev-hipe: - needs: [create-splash-image, collect-github-api-artifacts] - runs-on: [windows-2022] - steps: - - name: Start message - run: echo "Started CI build (Eclipse eMoflon Windows dev HiPE)." - - name: Install dependencies - run: | - choco install wget curl unzip zip --no-progress - - name: Install correct Java version - uses: actions/setup-java@v2 - with: - distribution: 'adopt' - java-version: '16' - - name: Fix Git line endings - run: git config --global core.autocrlf input - - name: Check out repository code - uses: actions/checkout@v2 - - name: Download splash image - uses: actions/download-artifact@v2 - with: - name: splash.bmp - - name: Download emoflon-headless updatesite - uses: actions/download-artifact@v2 - 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@v2 - with: - name: com.seeq.eclipse.importprojects.jar - - name: Run build script - run: | - bash ./build.sh -m hipedev -o windows - - name: Upload artifact - uses: actions/upload-artifact@v2 - with: - name: eclipse-emoflon-windows-dev-hipe - path: eclipse-emoflon-windows-dev-hipe.zip - # Create a release if running on tag create-release: - needs: [build-linux-user, build-linux-dev, build-linux-user-ci, build-linux-dev-ci, build-linux-dev-hipe, build-macos-user, build-macos-dev, build-macos-dev-hipe, build-windows-user, build-windows-dev, build-windows-dev-hipe] + needs: [build-linux-user, build-linux-dev, build-linux-user-ci, build-linux-dev-ci, build-macos-user, build-macos-dev, build-windows-user, build-windows-dev] 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' @@ -536,14 +420,3 @@ jobs: files: | eclipse-emoflon-windows-user/eclipse-emoflon-windows-user.zip eclipse-emoflon-windows-dev/eclipse-emoflon-windows-dev.zip - - name: Release eclipse-emoflon-dev-hipe-1 - uses: softprops/action-gh-release@v1 - with: - files: | - eclipse-emoflon-linux-dev-hipe/eclipse-emoflon-linux-dev-hipe.zip - eclipse-emoflon-windows-dev-hipe/eclipse-emoflon-windows-dev-hipe.zip - - name: Release eclipse-emoflon-dev-hipe-2 - uses: softprops/action-gh-release@v1 - with: - files: | - eclipse-emoflon-macos-dev-hipe/eclipse-emoflon-macos-dev-hipe.zip diff --git a/README.md b/README.md index d4600c7..adda144 100644 --- a/README.md +++ b/README.md @@ -10,13 +10,10 @@ This repository is used to automatically build an Eclipse [eMoflon::Neo](https:/ | Eclipse eMoflon dev | Linux | | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | Eclipse eMoflon user CI | Linux | :heavy_check_mark: | | | | | Eclipse eMoflon dev CI | Linux | | | | | -| Eclipse eMoflon dev HiPE | Linux | | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | Eclipse eMoflon user | Windows | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | Eclipse eMoflon dev | Windows | | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | -| Eclipse eMoflon dev HiPE | Windows | | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | Eclipse eMoflon user | macOS | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | Eclipse eMoflon dev | macOS | | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | -| Eclipse eMoflon dev HiPE | macOS | | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | **Additional packages** are installed for every non-CI build. From 65ecde2455888c00c0d39f5e7d5db4f54ab315f5 Mon Sep 17 00:00:00 2001 From: Maximilian Kratz Date: Wed, 9 Nov 2022 14:55:15 +0100 Subject: [PATCH 8/8] Removes all dev builds because Neo needs to be installed (bootstrapping) --- .github/workflows/ci.yml | 153 +-------------------------------------- README.md | 4 - 2 files changed, 1 insertion(+), 156 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 06dea69..28e6156 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -126,39 +126,6 @@ jobs: name: eclipse-emoflon-linux-user path: eclipse-emoflon-linux-user.zip - # Build Eclipse eMoflon Linux dev - build-linux-dev: - needs: [create-splash-image, collect-github-api-artifacts] - runs-on: [ubuntu-20.04] - steps: - - name: Start message - run: echo "Started CI build (Eclipse eMoflon Linux dev)." - - name: Check out repository code - uses: actions/checkout@v2 - - name: Download splash image - uses: actions/download-artifact@v2 - with: - name: splash.bmp - - name: Download emoflon-headless updatesite - uses: actions/download-artifact@v2 - 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@v2 - with: - name: com.seeq.eclipse.importprojects.jar - - name: Run build script - run: chmod +x build.sh && ./build.sh -m dev -o linux - - name: Upload artifact - uses: actions/upload-artifact@v2 - with: - name: eclipse-emoflon-linux-dev - path: eclipse-emoflon-linux-dev.zip - # Build Eclipse eMoflon Linux user CI build-linux-user-ci: needs: [collect-github-api-artifacts] @@ -190,37 +157,6 @@ jobs: name: eclipse-emoflon-linux-user-ci path: eclipse-emoflon-linux-user-ci.zip - # Build Eclipse eMoflon Linux dev CI - build-linux-dev-ci: - needs: [collect-github-api-artifacts] - runs-on: [ubuntu-20.04] - steps: - - name: Start message - run: echo "Started CI build (Eclipse eMoflon Linux dev CI)." - - name: Check out repository code - uses: actions/checkout@v2 - - name: Download emoflon-headless updatesite - uses: actions/download-artifact@v2 - 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@v2 - with: - name: com.seeq.eclipse.importprojects.jar - - name: Run build script - run: chmod +x build.sh && ./build.sh -m dev -o linux --skip-theme - - name: Rename ZIP archive - run: mv eclipse-emoflon-linux-dev.zip eclipse-emoflon-linux-dev-ci.zip - - name: Upload artifact - uses: actions/upload-artifact@v2 - with: - name: eclipse-emoflon-linux-dev-ci - path: eclipse-emoflon-linux-dev-ci.zip - # Build Eclipse eMoflon macOS user build-macos-user: needs: [create-splash-image, collect-github-api-artifacts] @@ -260,45 +196,6 @@ jobs: name: eclipse-emoflon-macos-user path: eclipse-emoflon-macos-user.zip - # Build Eclipse eMoflon macOS dev - build-macos-dev: - needs: [create-splash-image, collect-github-api-artifacts] - runs-on: [macos-latest] - steps: - - name: Start message - run: echo "Started CI build (Eclipse eMoflon macOS dev)." - - name: Install dependencies - run: | - brew update - brew install p7zip coreutils grep wget curl - - name: Check out repository code - uses: actions/checkout@v2 - - name: Download splash image - uses: actions/download-artifact@v2 - with: - name: splash.bmp - - name: Download emoflon-headless updatesite - uses: actions/download-artifact@v2 - 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@v2 - with: - name: com.seeq.eclipse.importprojects.jar - - name: Run build script - run: chmod +x build.sh && ./build.sh -m dev -o macos - - name: Fix permissions - run: sudo xattr -cr ./eclipse/Eclipse.app - - name: Upload artifact - uses: actions/upload-artifact@v2 - with: - name: eclipse-emoflon-macos-dev - path: eclipse-emoflon-macos-dev.zip - # Build Eclipse eMoflon Windows user build-windows-user: needs: [create-splash-image, collect-github-api-artifacts] @@ -343,53 +240,9 @@ jobs: name: eclipse-emoflon-windows-user path: eclipse-emoflon-windows-user.zip - # Build Eclipse eMoflon Windows dev - build-windows-dev: - needs: [create-splash-image, collect-github-api-artifacts] - runs-on: [windows-2022] - steps: - - name: Start message - run: echo "Started CI build (Eclipse eMoflon Windows dev)." - - name: Install dependencies - run: | - choco install wget curl unzip zip --no-progress - - name: Install correct Java version - uses: actions/setup-java@v2 - with: - distribution: 'adopt' - java-version: '16' - - name: Fix Git line endings - run: git config --global core.autocrlf input - - name: Check out repository code - uses: actions/checkout@v2 - - name: Download splash image - uses: actions/download-artifact@v2 - with: - name: splash.bmp - - name: Download emoflon-headless updatesite - uses: actions/download-artifact@v2 - 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@v2 - with: - name: com.seeq.eclipse.importprojects.jar - - name: Run build script - run: | - bash ./build.sh -m dev -o windows - - name: Upload artifact - uses: actions/upload-artifact@v2 - with: - name: eclipse-emoflon-windows-dev - path: eclipse-emoflon-windows-dev.zip - # Create a release if running on tag create-release: - needs: [build-linux-user, build-linux-dev, build-linux-user-ci, build-linux-dev-ci, build-macos-user, build-macos-dev, build-windows-user, build-windows-dev] + needs: [build-linux-user, build-linux-user-ci, build-macos-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' @@ -401,22 +254,18 @@ jobs: with: files: | eclipse-emoflon-linux-user/eclipse-emoflon-linux-user.zip - eclipse-emoflon-linux-dev/eclipse-emoflon-linux-dev.zip - name: Release eclipse-emoflon-macos uses: softprops/action-gh-release@v1 with: files: | eclipse-emoflon-macos-user/eclipse-emoflon-macos-user.zip - eclipse-emoflon-macos-dev/eclipse-emoflon-macos-dev.zip - name: Release eclipse-emoflon-linux-ci uses: softprops/action-gh-release@v1 with: files: | eclipse-emoflon-linux-user-ci/eclipse-emoflon-linux-user-ci.zip - eclipse-emoflon-linux-dev-ci/eclipse-emoflon-linux-dev-ci.zip - name: Release eclipse-emoflon-windows uses: softprops/action-gh-release@v1 with: files: | eclipse-emoflon-windows-user/eclipse-emoflon-windows-user.zip - eclipse-emoflon-windows-dev/eclipse-emoflon-windows-dev.zip diff --git a/README.md b/README.md index adda144..3e93a16 100644 --- a/README.md +++ b/README.md @@ -7,13 +7,9 @@ This repository is used to automatically build an Eclipse [eMoflon::Neo](https:/ | Name | OS | eMoflon installed | Dark theme installed | Splash image | Additional packages | |--------------------------|---------|--------------------|----------------------|--------------------|---------------------| | Eclipse eMoflon user | Linux | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | -| Eclipse eMoflon dev | Linux | | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | Eclipse eMoflon user CI | Linux | :heavy_check_mark: | | | | -| Eclipse eMoflon dev CI | Linux | | | | | | Eclipse eMoflon user | Windows | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | -| Eclipse eMoflon dev | Windows | | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | Eclipse eMoflon user | macOS | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | -| Eclipse eMoflon dev | macOS | | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | **Additional packages** are installed for every non-CI build.