Merge branch 'eMoflon:main' into main

Echtzeitsysteme · Oct 13, 2022 · b6cd293 · b6cd293
2 parents a14d275 + cece843
commit b6cd293
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,7 +22,7 @@ on:
 
 env:
   # Eclipse version to use in this CI
-  VERSION: "2022-06"
+  VERSION: "2022-09"
   # emoflon-headless source URL (needed by macOS-based runner workaround)
   EMOFLON_HEADLESS_SRC: "https://api.github.com/repos/eMoflon/emoflon-headless/releases/latest"
   # import plugin URL

diff --git a/build.sh b/build.sh
@@ -170,6 +170,20 @@ install_global_eclipse_settings () {
 	echo "-Declipse.pluginCustomization=emoflon.properties" >> $ECLIPSE_BASE_PATH/eclipse.ini
 }
 
+# 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_METADATA="org.eclipse.equinox.p2.metadata.repository.prefs"
+	UPDATE_SITE_ARTIFACT="org.eclipse.equinox.p2.artifact.repository.prefs"
+
+	# First, create a ZIP as "backup"
+	zip -q -r $UPDATE_SITE_CONFIG_PATH/update-sites.zip $UPDATE_SITE_CONFIG_PATH/$UPDATE_SITE_ARTIFACT $UPDATE_SITE_CONFIG_PATH/$UPDATE_SITE_METADATA
+
+	rm -rf $UPDATE_SITE_CONFIG_PATH/$UPDATE_SITE_ARTIFACT 
+	rm -rf $UPDATE_SITE_CONFIG_PATH/$UPDATE_SITE_METADATA
+}
+
 
 #
 # Script
@@ -252,6 +266,9 @@ done
 # Install com.seeq.eclipse.importprojects (by hand because there is no public update site)
 install_eclipse_import_projects
 
+# Remove all configured update sites
+remove_update_sites
+
 # Deploy custom splash image
 if [[ $SKIP_THEME -eq 1 ]]; then
 	# Skip UI customization for CI builds